Kamil Trzciński
0c563225b6
Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'
...
Handle maximum pages artifacts size correctly
Closes #35317
See merge request !13072
2017-07-26 14:00:42 +00:00
Sean McGivern
5de3ec64da
Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'
...
Handle errors while a project is being deleted asynchronously.
Closes #29289
See merge request !11088
2017-07-26 12:49:54 +00:00
Douwe Maan
d29598e691
Merge remote-tracking branch 'dev/master'
...
# Conflicts:
# Gemfile
# Gemfile.lock
2017-07-26 14:47:50 +02:00
Tiago Botelho
b5bdc55d23
Move exception handling to execute
2017-07-26 12:47:50 +01:00
Yorick Peterse
549d2cc8d0
Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master'
...
Add lower path index to redirect_routes
Closes #34638
See merge request !13062
2017-07-26 11:19:41 +00:00
Sean McGivern
96dba2ca17
Merge branch 'post-upload-pack-opt-out' into 'master'
...
Enable gitaly_post_upload_pack by default
See merge request !13078
2017-07-26 10:39:15 +00:00
Michael Kozono
8bc20a8e00
Add changelog entry
2017-07-26 02:43:39 -07:00
Tim Zallmann
9aa2205a15
Resolve "Memory usage notice doesn't link anywhere"
2017-07-26 09:31:17 +00:00
Sean McGivern
f2da36f196
Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' into 'master'
...
Fixes 500 error caused by pending delete projects in admin dashboard
Closes #35453
See merge request !13067
2017-07-26 08:29:38 +00:00
Sean McGivern
121b90aa69
Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' into 'master'
...
Pending delete projects should now show in deploy keys
Closes #35338
See merge request !13088
2017-07-26 08:27:41 +00:00
Sean McGivern
fd0823d6e4
Merge branch '31129-jira-project-key-elim' into 'master'
...
Remove project_key from the JIRA configuration
Closes #31129
See merge request !12050
2017-07-26 08:26:47 +00:00
Sean McGivern
b0e30e8608
Merge branch 'bump-omniauth-ldap-gem-version' into 'master'
...
Bumps Gitlab Omniauth LDAP version
See merge request !13059
2017-07-26 08:19:32 +00:00
Tiago Botelho
250dbecd28
Pending delete projects should not show in deploy keys
2017-07-25 18:29:33 +01:00
Tiago Botelho
22d53f0607
Fixes 500 error caused by pending delete projects in admin dashboard
2017-07-25 17:59:47 +01:00
Michael Kozono
6263ecd3a4
Add lower path index to redirect_routes
2017-07-25 09:22:30 -07:00
Rémy Coutable
c07dfe668e
Merge branch '35204-doc-api-ci-lint-typo' into 'master'
...
Add link to doc/api/ci/lint.md
Closes #35204
See merge request !12914
2017-07-25 16:09:05 +00:00
Jarka Kadlecova
1c57299400
Remove project_key from the Jira configuration
2017-07-25 17:25:41 +02:00
Phil Hughes
2a572d2634
Merge branch '2971-multiproject-grah-ce-port' into 'master'
...
Fix vertical alignment in firefox and safari for pipeline mini graph
See merge request !13071
2017-07-25 15:15:26 +00:00
Kamil Trzciński
ac948684fc
Merge branch '30634-protected-pipeline' into 'master'
...
Implement "Block pipelines on protected branches"
Closes #30634 , #34616 , and #33130
See merge request !11910
2017-07-25 15:04:23 +00:00
James Edwards-Jones
3f59e354a7
Update CHANGELOG.md for 9.4.1
...
[ci skip]
2017-07-25 15:28:13 +01:00
Jacob Vosmaer
a78306e7fa
Enable gitaly_post_upload_pack by default
2017-07-25 15:23:41 +02:00
Tiago Botelho
a872c3e886
Bumps Gitlab Omniauth LDAP version
2017-07-25 12:57:43 +01:00
Sean McGivern
bd13978c71
Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'
...
Adds link_to_gfm method instrumentation
See merge request !13069
2017-07-25 11:12:36 +00:00
Filipa Lacerda
b53d6e5581
Merge branch 'new-navigation-custom-logo' into 'master'
...
Fixed custom logo sizing in new navigation header
Closes #35439
See merge request !13034
2017-07-25 11:07:26 +00:00
Grzegorz Bizon
8a50e5fb0c
Add changelog for max pages artifacts size fix
2017-07-25 13:04:22 +02:00
Filipa Lacerda
531681c11d
Fix vertical alignment in firefox and safari for pipeline mini graph
2017-07-25 11:29:01 +01:00
Dmitriy Zaporozhets
a53cc4893c
Merge branch 'bvl-free-unused-names' into 'master'
...
Free some unused reserved top-level words.
Closes #35053
See merge request !12932
2017-07-25 10:11:27 +00:00
Kamil Trzciński
a62a2e2452
Merge branch 'fix/gb/fix-build-merge-request-link-to-fork-project' into 'master'
...
Fix job merge request link to a forked source project
Closes #35109
See merge request !12965
2017-07-25 10:06:55 +00:00
Tiago Botelho
4236c2f055
Adds link_to_gfm method instrumentation
2017-07-25 10:51:21 +01:00
Rémy Coutable
ba820e87dc
Merge branch '35478-allow-admin-to-read-user-list' into 'master'
...
Allow admin to read_users_list even if it's restricted
Closes #35478
See merge request !13066
2017-07-25 09:41:51 +00:00
Oswaldo Ferreira
33dc5171e5
Resolve "More RESTful API: include resource URLs in responses"
2017-07-25 09:35:45 +00:00
Rémy Coutable
d5801545ec
Merge branch 'archytaus/gitlab-ce-26372-duplicate-issue-slash-command' into 'master'
...
New `/duplicate` quick action
Closes #26372
See merge request !12845
2017-07-25 09:30:15 +00:00
Lin Jen-Shin
25e44edc30
Allow admin to read_users_list even if it's restricted
2017-07-25 16:49:26 +08:00
Phil Hughes
1897aafdf8
Merge branch '35163-url-in-commit-message-can-be-broken-in-blame' into 'master'
...
Use only CSS to truncate commit message in blame
Closes #35163
See merge request !12900
2017-07-25 08:05:45 +00:00
Bob Van Landuyt
d22fe96b58
Take ee words into account
...
We need to reserve these words in EE to support the upgrade path from
CE to EE.
2017-07-25 09:18:54 +02:00
Takuya Noguchi
3951eb6270
Use only CSS to truncate commit message in blame
2017-07-25 13:00:45 +09:00
Robert Speicher
d964816b9f
Merge branch 'bvl-fix-login-issue-with-ldap-enabled' into 'master'
...
Load the sessionscontroller after loading the ldap strategies
Closes #35447
See merge request !13049
2017-07-24 22:42:52 +00:00
Filipa Lacerda
6536c990f0
Merge branch 'issue-boards-close-icon-size' into 'master'
...
Fixed issue boards sidebar close button with new navigation
Closes #35296
See merge request !12991
2017-07-24 21:57:34 +00:00
Bob Van Landuyt
fa9adb6599
Explicitly add protect_from_forgery
action
...
Otherwise the token might be cleared before authentication is
done, causing the authentication itself to fail
2017-07-24 23:28:07 +02:00
Tim Zallmann
52b8a0db68
Resolve "Lazy load images on the Frontend"
2017-07-24 17:36:52 +00:00
Sean McGivern
ccac2abeba
Don't treat anonymous users as owners when group has pending invites
...
The `members` table can have entries where `user_id: nil`, because people can
invite group members by email. We never want to include those as members,
because it might cause confusion with the anonymous (logged out) user.
2017-07-24 16:58:04 +01:00
Phil Hughes
c2c8d7ffab
Merge branch 'dz-fix-calendar-today' into 'master'
...
Fix today day highlight in calendar
Closes #32169
See merge request !13048
2017-07-24 14:01:03 +00:00
Filipa Lacerda
87521660e8
Merge branch '35391-fix-star-i18n-in-js' into 'master'
...
Fix translations for Star/Unstar in JS file
Closes #35391
See merge request !13013
2017-07-24 13:50:14 +00:00
Filipa Lacerda
c76804071e
Merge branch 'new-nav-duplicated-new-milestone-buttons' into 'master'
...
Fixed duplicate new milestone buttons in new navigation
Closes #35454
See merge request !13033
2017-07-24 13:28:00 +00:00
Sean McGivern
e5b9bcff21
Merge branch '31533-usage-data-projects-stats' into 'master'
...
Add Slack and JIRA services counts to Usage Data
Closes #31533
See merge request !12974
2017-07-24 13:09:49 +00:00
Sean McGivern
6d13bc5863
Merge branch '33097-issue-tracker' into 'master'
...
Associate Issues tab only with internal issues tracker
Closes #33097
See merge request !12130
2017-07-24 13:00:33 +00:00
Dmitriy Zaporozhets
ff3d3ccb3f
Fix today day highlight in calendar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-24 15:52:10 +03:00
Sean McGivern
7eaef13093
Merge branch 'pawel/bump_prometheus_client_library' into 'master'
...
Fix bug causing truncation of Metrics files
See merge request !13035
2017-07-24 12:11:12 +00:00
Pawel Chojnacki
87308484fa
[ci skip] Add Changelog entry metrics files handling
2017-07-24 13:22:59 +02:00
Rémy Coutable
5a9554bb33
Merge branch 'bvl-fix-invalid-po-files' into 'master'
...
Fix currently invalid po files
Closes #35302 and #35235
See merge request !13032
2017-07-24 11:07:30 +00:00