summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Introduce a new middleware for the test environment that can block requests28307-fix-sporadic-feature-spec-failuresRémy Coutable2017-03-106-1/+108
| | | | | | | | | | | | The idea is that after each feature spec example, we block all incoming requests at the Rack level, go to the 'about:blank' page, and wait until the current requests reach 0. This should solve the problem where a request would end after database cleaner performed the database truncation. The problem was that a GET request can still lead to records creation (e.g. namespaces or routes). Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisionsAnnabel Dunstone Gray2017-03-103-5/+5
|\ | | | | | | | | | | | | Consistent button colors for disabled buttons Closes #29263 and #29221 See merge request !9848
| * Consistent button colors for disabled buttons29263-merge-button-colorSimon Knox2017-03-103-5/+5
| |
* | Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master' Douwe Maan2017-03-103-6/+25
|\ \ | | | | | | | | | | | | | | | | | | adds queue option to push bulk in authorized projects worker Closes #29137 See merge request !9813
| * | adds queue option to push bulk in authorized projects worker29137-bulk-perform-async-should-specify-queueTiago Botelho2017-03-103-6/+25
| | |
* | | Merge branch 'enable-snippets-by-default' into 'master' Douwe Maan2017-03-103-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable snippets for new projects by default Closes #28192 See merge request !9857
| * | | Enable snippets for new projects by defaultenable-snippets-by-defaultSean McGivern2017-03-103-2/+6
| | | | | | | | | | | | | | | | | | | | If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change.
* | | | Merge branch 'tc-fix-project-create-500' into 'master'Douwe Maan2017-03-104-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for creating a project through API when import_url is nil Closes #29121 See merge request !9841
| * | | | Fix for creating a project through API when import_url is niltc-fix-project-create-500Toon Claes2017-03-104-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API was returning 500 when `nil` is passed for the `import_url`. In fact, it was `Gitlab::UrlSanitizer.valid?` which was throwing a `NoMethodError` when `nil` value was passed.
* | | | | Merge branch '28307-update-projects-edit-feature-spec' into 'master' Rémy Coutable2017-03-101-19/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update feature visibility spec for projects edit page See merge request !9787
| * | | | | Update feature visibility spec for projects edit pageDavid Piegza2017-03-091-19/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'gitaly-config' into 'master' Sean McGivern2017-03-101-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document gitaly.socket_path setting See merge request !9858
| * | | | | Document gitaly.socket_path settingJacob Vosmaer2017-03-101-0/+10
| | | | | |
* | | | | | Merge branch 'adam-prevent-two-issue-trackers' into 'master' Sean McGivern2017-03-104-1/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent more than one issue tracker to be active for the same project Closes #22797 See merge request !9669
| * | | | | | Prevent more than one issue tracker to be active for the same projectLuis Del Giudice2017-03-104-1/+49
| | | | | | |
* | | | | | | Merge branch '29316-can-t-select-a-mirror-user' into 'master' Sean McGivern2017-03-101-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Can't select a mirror user" See merge request !9854
| * | | | | | | Fix autocomplete in EE when permissions are sent29316-can-t-select-a-mirror-userSean McGivern2017-03-101-2/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EE, `@users` can be an array at the point where we remove the current user, because it can do a permissions check on the users for project mirroring. Fix this in CE by only using array methods, not AR methods. We can't use `delete` because that uses `Object#equal?`, which isn't true in this case.
* | | | | | | Merge branch '29209-sign-up-form-name' into 'master' Annabel Dunstone Gray2017-03-102-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change label for name on sign up form Closes #29209 See merge request !9845
| * | | | | | | Change label for name on sign up form29209-sign-up-form-nametauriedavis2017-03-092-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'docs/pages-unzip-dep' into 'master' Achilleas Pipinellis2017-03-101-8/+12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add zip/unzip as dependencies for Pages source installations Closes #28440 See merge request !9828
| * | | | | | | Add zip/unzip as dependencies for Pages source installationsdocs/pages-unzip-depAchilleas Pipinellis2017-03-091-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'docs/contributing-md-labels' into 'master' Achilleas Pipinellis2017-03-101-0/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a section on issue/MR labeling in CONTRIBUTING.md Closes #25097 See merge request !9850
| * | | | | | | Add a section on issue/MR labeling in CONTRIBUTING.mddocs/contributing-md-labelsAchilleas Pipinellis2017-03-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25097 [ci skip]
* | | | | | | | Merge branch 'fe-arch-step' into 'master' Jacob Schatz2017-03-101-2/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds information about architecture step. See merge request !9844
| * | | | | | | | Adds information about architecture step.Filipa Lacerda2017-03-101-2/+20
|/ / / / / / / /
* | | | | | | | Merge branch '24166-close-builds-dropdown' into 'master' Clement Ho2017-03-105-80/+122
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent dropdown from closing when user clicks in a build. Closes #24166 See merge request !9834
| * | | | | | | Updates test to use html tags24166-close-builds-dropdownFilipa Lacerda2017-03-091-1/+7
| | | | | | | |
| * | | | | | | Target all build links inside a dropdown. Use jQuery to handle event delegation.Filipa Lacerda2017-03-092-4/+8
| | | | | | | |
| * | | | | | | Use harmony syntax instead of cjsFilipa Lacerda2017-03-091-2/+2
| | | | | | | |
| * | | | | | | Uses vanilla JS to listen to click eventFilipa Lacerda2017-03-095-96/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes `:visible` from selector Adds CHANGELOG entry Removes iife
| * | | | | | | Prevent dropdown from closing when user clicks in a build.Filipa Lacerda2017-03-092-0/+31
| | | | | | | |
* | | | | | | | Merge branch 'fix/gb/passed-with-warnings-status-on-mysql' into 'master' Kamil Trzciński2017-03-105-8/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "passed with warnings" stage status on MySQL Closes #28603 See merge request !9802
| * | | | | | | | Fix Rubocop offense in CI/CD stage codefix/gb/passed-with-warnings-status-on-mysqlGrzegorz Bizon2017-03-081-1/+1
| | | | | | | | |
| * | | | | | | | Add changelog for passed with warnings status fixGrzegorz Bizon2017-03-081-0/+4
| | | | | | | | |
| * | | | | | | | Fix `passed with warnings` stage status on MySQLGrzegorz Bizon2017-03-084-8/+35
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/ux-copy-confirmation-dialogs' into 'master' Achilleas Pipinellis2017-03-101-0/+9
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add confirmation dialogs guidelines in UX copy See merge request !9833
| * | | | | | | | Add confirmation dialogs guidelines in UX copydocs/ux-copy-confirmation-dialogsAchilleas Pipinellis2017-03-091-0/+9
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'update-install-guides-9-0' into 'master' Rémy Coutable2017-03-102-2/+236
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Flush out the update guide from 8.17 - 9.0 See merge request !9823
| * | | | | | | Add missed review update for 8.17 to 9.0 documentupdate-install-guides-9-0DJ Mountney2017-03-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed removing one of the redundant lines
| * | | | | | | Cleanup 8.17 to 9.0 doc with review suggestionsDJ Mountney2017-03-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redundant wording. Clean up code blocks and links.
| * | | | | | | Flush out the update guide from 8.17 - 9.0DJ Mountney2017-03-082-2/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And bump the stable branch version in the installation from source guide
* | | | | | | | Merge branch '27899-fix-diff-view-comment-form-placement' into 'master'Jacob Schatz2017-03-091-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get view type based on diff_view Cookie Closes #27899 See merge request !9821
| * | | | | | | | Get view type based on diff_view Cookie27899-fix-diff-view-comment-form-placementAlfredo Sumaran2017-03-081-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because we need to persist the same view type across tabs
* | | | | | | | | Merge branch 'dm-downtime-check-only-added-files' into 'master' Robert Speicher2017-03-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Only check new migrations in 'rake downtime_check' See merge request !9785
| * | | | | | | | Only check new migrations in 'rake down_timecheck'dm-downtime-check-only-added-filesDouwe Maan2017-03-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'convert-data-attr-search-bar' into 'master' Alfredo Sumaran2017-03-091-17/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert data attributes in search_bar.html.haml Closes #29082 See merge request !9819
| * | | | | | | | Convert data attributes in search_bar.html.hamlClement Ho2017-03-091-17/+17
| | | | | | | | |
* | | | | | | | | Merge branch '28874-fix-milestone-issues-position-order-in-api' into 'master' Rémy Coutable2017-03-095-6/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Order milestone issues by position ascending in api Closes #28847 See merge request !9635
| * | | | | | | | Order milestone issues by position ascending in apiGeorge Andrinopoulos2017-03-095-6/+40
|/ / / / / / / /
* | | | | | | | Merge branch '29048-user-wrap-firefox' into 'master' Clement Ho2017-03-091-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline-block styling from dropdown avatars Closes #29048 See merge request !9840