Commit Graph

53490 Commits

Author SHA1 Message Date
blackst0ne a544e46bb0 Add a rubocop rule to check if a method 'redirect_to' is used without explicitly set 'status' in 'destroy' actions of controllers 2017-06-07 09:45:16 +11:00
Douwe Maan 71f9c43c83 Merge branch '27148-limit-bulk-create-memberships' into 'master'
Limit non-administrators to adding 100 members at a time to groups and projects

Closes #27148

See merge request !11940
2017-06-06 20:45:34 +00:00
Filipa Lacerda d1c2d36f03 Merge branch 'fix_commits_page' into 'master'
Fix duplication of commits header on commits page

Closes #13879

See merge request !11006
2017-06-06 19:57:07 +00:00
Phil Hughes 1d5d2a10a3 Merge branch 'single-click-filter' into 'master'
Change from double click to single click to open dropdown

Closes #31757

See merge request !11943
2017-06-06 18:03:03 +00:00
Rémy Coutable 6ac1caa01a Merge branch '33279_pc_application_settings_performance' into 'master'
redesign caching of application settings

See merge request !11894
2017-06-06 16:48:11 +00:00
Paul Charlton d93352825a redesign caching of application settings 2017-06-06 16:48:10 +00:00
Rémy Coutable 86b4cd618d Merge branch 'fix/encoding-binary-issue' into 'master'
Fix binary encoding error on MR diffs

Closes #32670

See merge request !11929
2017-06-06 16:40:08 +00:00
James Lopez 6b53add3f9 Fix binary encoding error on MR diffs 2017-06-06 16:40:07 +00:00
Robert Speicher b9fcc48aef Merge branch 'fix-test_env-set_repo_refs' into 'master'
Actually clean gitlab-test path when TestEnv.set_repo_refs fails

See merge request !11939
2017-06-06 16:24:13 +00:00
Clement Ho 196a3c546c Change from double click to single click to open dropdown 2017-06-06 10:52:50 -05:00
Phil Hughes 02a877acc1 Merge branch '31656-fix-hyperlink-a11y' into 'master'
Fix missing tooltip and ARIA labels for accessibility

Closes #31656

See merge request !11907
2017-06-06 15:05:14 +00:00
Kushal Pandya d54faf2cdd Fix missing tooltip and ARIA labels for accessibility 2017-06-06 15:05:13 +00:00
Nick Thomas 5c602e306c Limit non-administrators to adding 100 members at a time to groups and projects 2017-06-06 16:04:26 +01:00
Phil Hughes 2f02843fe9 Merge branch '28340-mass-edit-issues-and-mrs-from-sidebar' into 'master'
Move issuable bulk edit form into a sidebar

Closes #28340

See merge request !11351
2017-06-06 15:02:35 +00:00
Grzegorz Bizon a2a105f514 Merge branch 'pages-v0.4.3' into 'master'
Update GitLab Pages to v0.4.3

See merge request !11930
2017-06-06 14:57:27 +00:00
Sean Packham e6ec94134a Merge branch 'docs/registry-self-sign' into 'master'
Add info on using self-signed certs with Registry

Closes #18239

See merge request !11938
2017-06-06 14:35:54 +00:00
Sean Packham de12e4e204 Merge branch 'docs/powershell-ci-vars' into 'master'
Add PowerShell to CI variable docs

See merge request !11935
2017-06-06 14:30:08 +00:00
Achilleas Pipinellis b60aa77aaa Add info on using self-signed certs with Registry 2017-06-06 16:26:12 +02:00
Rémy Coutable 3cda57b4ab
Actually clean gitlab-test path when TestEnv.set_repo_refs fails
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-06 16:23:40 +02:00
Grzegorz Bizon 606e9cefd8 Merge branch '32642_last_commit_id_in_file_api' into 'master'
Introduce optimistic locking support via optional parameter last_commit_id on File Update API

See merge request !11694
2017-06-06 13:55:34 +00:00
Roman Safronov 1110def8e2 Introduce optimistic locking support via optional parameter last_commit_id on File Update API 2017-06-06 13:55:29 +00:00
Grzegorz Bizon 9f3a1203df Merge branch '29271-fix-pages-numeric-domain' into 'master'
Allow numeric pages domain

Closes #29271

See merge request !11927
2017-06-06 13:49:58 +00:00
Grzegorz Bizon 35083dc9e7 Merge branch 'fix_explanation_of_job_level_variable_override' into 'master'
Update explanation of job-level variable override to fit example

See merge request !11923
2017-06-06 13:47:23 +00:00
Rémy Coutable 4ab1e07fd3 Merge branch '14707-allow-activity-feed-to-be-accessible-through-api' into 'master'
Introduce an Events API

Closes #14707

See merge request !11755
2017-06-06 13:41:08 +00:00
Bryce Johnson c9a67266d2 Move issuable bulk edit form into a new sidebar. 2017-06-06 09:16:27 -04:00
John Spaetzel 1d0219a526 Add PowerShell to CI variable docs 2017-06-06 15:02:03 +02:00
Phil Hughes 34f925fe0b Merge branch '23643-responsive-environment-tables' into 'master'
Responsive environment tables

See merge request !11836
2017-06-06 12:58:31 +00:00
Annabel Dunstone Gray 7a9c9a259e Responsive environment tables 2017-06-06 12:58:29 +00:00
Mark Fletcher 3c15f0eae7 Accept a username for User-level Events API 2017-06-06 20:16:41 +08:00
Mark Fletcher ad3e180ed3 Introduce an Events API
* Meld the following disparate endpoints:
 * `/projects/:id/events`
 * `/events`
 * `/users/:id/events`
+ Add result filtering to the above endpoints:
 * action
 * target_type
 * before and after dates
2017-06-06 20:16:41 +08:00
Nick Thomas 0a04eab86e Update GitLab Pages to v0.4.3 2017-06-06 12:45:06 +01:00
Drew Blessing 8df7bcf532 Allow numeric pages domain
Previously, `PagesDomain` would not allow a domain such as
123.example.com. With this change, this is now allowed, because
it is a perfectly valid domain.
2017-06-06 12:39:37 +01:00
Sean McGivern e34e576104 Merge branch '33340-fix-broken-master' into 'master'
Fix Projects API spec

Closes #33340

See merge request !11928
2017-06-06 11:36:39 +00:00
Achilleas Pipinellis 1e671309a3 Merge branch 'evn-crosslink-to-architecture' into 'master'
Make sketch dynamic and link back to production architecture

See merge request !11617
2017-06-06 11:27:51 +00:00
Sean Packham beceb2334d Merge branch 'docs/remove-ref-to-wheel-settings' into 'master'
Remove references to old settings location

Closes #33041

See merge request !11932
2017-06-06 11:04:10 +00:00
Achilleas Pipinellis 39710abc62 Remove references to old settings location 2017-06-06 12:45:55 +02:00
Achilleas Pipinellis 5f77689e78 Merge branch '30156-api-environment-info-missed' into 'master'
Resolve "API: Environment info missed"

Closes #30156

See merge request !11900
2017-06-06 10:23:29 +00:00
Sébastien a17bfd368f Resolve "API: Environment info missed" 2017-06-06 10:23:29 +00:00
Rémy Coutable 33fad62d8e
Fix Projects API spec
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-06 11:53:06 +02:00
Achilleas Pipinellis 4a811fbc11 Merge branch '32236-fix-typo-in-helm-chart-installation-doc' into 'master'
Fix typo in helm chart installation doc (#32236)

Closes #32236

See merge request !11891
2017-06-06 09:04:57 +00:00
Achilleas Pipinellis 59bd1d2cea Merge branch 'dz-backport-codeclimate-docs' into 'master'
Backport CI codeclimate example doc change from EE

See merge request !11903
2017-06-06 08:50:44 +00:00
Achilleas Pipinellis 1d847b48c6 Merge branch 'add-note-on-body-size' into 'master'
Add note on customizing body size to support Registry

See merge request !11904
2017-06-06 08:49:51 +00:00
Achilleas Pipinellis a5b5956135 Merge branch 'patch-23' into 'master'
Corrected spelling mistake in permissions.md "it total" -> "in total".

See merge request !11908
2017-06-06 08:47:34 +00:00
Achilleas Pipinellis aab8f27724 Merge branch 'docs/fix-headings-for-seo' into 'master'
Issues documentation: improve SEO

See merge request !11919
2017-06-06 08:46:06 +00:00
Phil Hughes 042fbc4968 Merge branch '24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically' into 'master'
Resolve "When changing project visibility setting, change other dropdowns automatically"

Closes #24032

See merge request !11831
2017-06-06 08:28:40 +00:00
Mike Greiling e245d7eebe Resolve "When changing project visibility setting, change other dropdowns automatically" 2017-06-06 08:28:39 +00:00
Tor Bechmann Yamamoto-Sørensen c4878a762f Update explanation of job-level variable override to fit example 2017-06-06 16:59:53 +09:00
Rémy Coutable 17feb2faa7 Merge branch 'issue-23254' into 'master'
Cleanup style of confirmation page

See merge request !11774
2017-06-06 07:48:09 +00:00
Rémy Coutable 6251df6d6a Merge branch 'sh-fix-typo-user-activity-service' into 'master'
Fix typo in user activity debug log message

See merge request !11898
2017-06-06 07:10:57 +00:00
Brian Neel 9bc8932390 Merge branch '29690-rotate-otp-key-base' into 'master'
Add a Rake task to aid in rotating otp_key_base

Closes #29690

See merge request !11881
2017-06-06 03:24:10 +00:00