- 19 Oct, 2016 28 commits
-
-
Douwe Maan authored
Bump `omniauth-saml` to 1.7.0 Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support for IdP auto-configuration. cc @dblessing @dewetblomerus See merge request !6997
-
Robert Speicher authored
Merge branch '22457-reset-filters-button-should-be-invisible-when-no-filters-are-active' into 'master' `Reset filters` link should only be visible when filters are active ## Why was this MR needed? `Reset filters` link is always visible. Closes #22457 See merge request !6497
-
Rémy Coutable authored
Keep around commits only on pipeline create ## What does this MR do? Since the pipeline SHA doesn't change, we don't need to update keep arounds every save. ## Why was this MR needed? This is minimal change to fix this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23503 See merge request !6986
-
Fatih Acet authored
Add pipelines tab to new MR #### What does this MR do? Adds pipelines tab to new MRs #### Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_10.23.27_AM](/uploads/6c3f8f2be0cf9ba7cc78f6d918307ec0/Screen_Shot_2016-10-10_at_10.23.27_AM.png) ![Screen_Shot_2016-10-11_at_8.59.45_AM](/uploads/e67577d92327eafef6f04073f3d94212/Screen_Shot_2016-10-11_at_8.59.45_AM.png) #### What are the relevant issue numbers? Closes #21444 See merge request !6238
-
Achilleas Pipinellis authored
Fix name of feature that restricts access to builds traces ## What does this MR do? This MR fixes the name of the feature that makes it possible to restrict build traces. This does not disable access to pipelines. Pipelines are still available so we should tie the name with builds, instead of using work "pipeline" there. See merge request !6980
-
Patricio Cano authored
Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support for IdP auto-configuration.
-
Jacob Schatz authored
Changed build header username area to use the full name with the username as the tooltip ## What does this MR do? Changes build header username to use the full name with the username as the tooltip. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? UI consistency ## Screenshots (if relevant) ![2016-09-08_19.24.22](/uploads/958422819ae3057f1499b2686d83e326/2016-09-08_19.24.22.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Contributes to #21832 See merge request !6272
-
Sean McGivern authored
fix: commit messages being double-escaped in activities tab See merge request !6937
-
Douwe Maan authored
Revert issuable title reordering Reverts !6503, and uses `to_reference` rather than `iid` for `Issues#show` and `Issues#edit` titles. See merge request !6983
-
Sean McGivern authored
Refactor group_members_controller_spec Make tests more readable, DRY and closer to RSpec best practices. See merge request !6985
-
Kamil Trzcinski authored
-
Rémy Coutable authored
Grapify the commit status API ## What does this MR do? Add the Grape-DSL to the commit status API. ## What are the relevant issue numbers? Related to #22928 See merge request !6879
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Robert Schilling authored
-
Rémy Coutable authored
API: Fix Sytem hooks delete behavior ## What does this MR do? This corrects the delete API for system hooks. Returning 200 is not the right way indicating a hooks is not found. ## What are the relevant issue numbers? Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6861/diffs#609af00c90e3d5241064d1404e3e018a3235634a_64_62 See merge request !6883
-
Robert Speicher authored
Thanks to Greg Laubenstein for noticing in !6503
-
Robert Speicher authored
This reverts commit 434d98b2, reversing changes made to b6a83be6.
-
Robert Speicher authored
Improve error logging of MergeService Relates to #23505 See merge request !6975
-
Robert Speicher authored
Fix broken award emoji for comments Closes #23506 See merge request !6967
-
Douwe Maan authored
Backport git access spec changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645#note_16391185 See merge request !6961
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Delete dynamic environments - Adds "close environment" action to a merge request - Adds tabs to environments list - Adds close button to each environment row in environments list - Replaces Destroy button with Close button inside an environment - Adds close button to builds list inside an environment #### Configuration In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App when: manual environment: name: review/$app action: stop ``` This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined. The next MR after this one will verify that and enforce that these settings are configured. It will also implicitly configure these settings, making it possible to define it like this: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App ``` Closes #22191 See merge request !6669
-
Stan Hu authored
-
Stan Hu authored
Relates to #23505
-
Stan Hu authored
Use Hash rocket syntax to maintain Ruby 2.1 compatibility Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/5258614 Closes #23498 See merge request !6972
-
Stan Hu authored
Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/5258614 Closes #23498
-
Jacob Schatz authored
Fix pipeline alignment Before: <img src="/uploads/8169695c5e594ee3f42a73cc1a91fd1a/Screen_Shot_2016-10-18_at_6.58.49_PM.png" width="400px"> After: <img src="/uploads/d608380057ef66223925db3524f691fb/Screen_Shot_2016-10-18_at_7.04.15_PM.png" width="400px"> See merge request !6971
-
Annabel Dunstone Gray authored
-
- 18 Oct, 2016 12 commits
-
-
Stan Hu authored
Use Hash rocket syntax to maintain Ruby 2.1 compatibility Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/5246591 Closes #23498 See merge request !6966
-
Stan Hu authored
-
Stan Hu authored
Closes #23506
-
Stan Hu authored
Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/5246591 Closes #23498
-
Stan Hu authored
Fix missing semicolon to make scss-lint happy Builds were failing: https://gitlab.com/gitlab-org/gitlab-ce/builds/5256491 See merge request !6969
-
Stan Hu authored
-
Sean McGivern authored
Add Nofollow for uppercased external url protocols Closes #22782 See merge request !6820
-
Jacob Schatz authored
Triggered pipelines #### What does this MR do? Separates trigger into its own column #### Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_4.21.54_PM](/uploads/092e8205d329b66b34045fe17c5e6e4f/Screen_Shot_2016-10-07_at_4.21.54_PM.png) ![Screen_Shot_2016-10-17_at_9.13.10_AM](/uploads/7df90e0e2a07a9f282df3605787d3cc2/Screen_Shot_2016-10-17_at_9.13.10_AM.png) ![Screen_Shot_2016-10-17_at_9.15.07_AM](/uploads/b7dc0307c8549e72c3f812c3cd91833a/Screen_Shot_2016-10-17_at_9.15.07_AM.png) #### What are the relevant issue numbers? Closes #19991 See merge request !6753
-
Jacob Schatz authored
Add missing Vue dependency Cycle Analytics is broken because vueJS is not included. This feature will be improved on its second iteration, and also tests will be aded so this won't happen again. See merge request !6965
-
Alfredo Sumaran authored
-
Dmitriy Zaporozhets authored
Wait for ajax for every merge request spinach test ## What does this MR do? * removes duplicate `WaitForAjax` module * ensure we run `wait_for_ajax`after each MR spinach tests ## Why was this MR needed? Because when visit MR page we do ajax call to check CI status. When testing this page with spinach and JS driver we got random failing tests. It happens because of race condition db cleaner drop data before ajax call finished. So we make sure that every MR spinach scenario with js driver waits for ajax before running next scenario ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23461 See merge request !6959
-
Sean McGivern authored
Stop event_commit_title from escaping its output Fixes a double-escape issue (actually triple-escape!) viewing the activity feed Closes #23311 Related to #23258 !6832 See merge request !6930
-