Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update design_patterns.md DOM class manipulation to promote classes that ↵design_patterns-dom-manipulation-class | Luke "Jared" Bennett | 2017-05-16 | 1 | -8/+15 |
| | | | | aren't coupled to DOM in too specific ways and easy to test. | ||||
* | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' | Douwe Maan | 2017-05-16 | 5 | -0/+22 |
|\ | | | | | | | | | | | | | disable animations for tests Closes #32194 See merge request !11324 | ||||
| * | Add test.js and test.css to disable animations during testing and include ↵disable-css-and-jquery-animations-for-capybara | Luke "Jared" Bennett | 2017-05-15 | 5 | -0/+22 |
| | | | | | | | | these in _head when testing | ||||
* | | Merge branch 'say-bye-bye-nicescroll' into 'master' | Annabel Dunstone Gray | 2017-05-16 | 3 | -13/+9 |
|\ \ | | | | | | | | | | | | | Removes nicescroll from issuable sidebar See merge request !10831 | ||||
| * | | Removes nicescroll from issuable sidebar | Phil Hughes | 2017-05-16 | 3 | -13/+9 |
|/ / | |||||
* | | Merge branch '31998-pipelines-empty-state' into 'master' | Phil Hughes | 2017-05-16 | 3 | -16/+40 |
|\ \ | | | | | | | | | | | | | | | | | | | Only renders empty state for pipelines table if no pipelines are received when request is made Closes #31998 See merge request !11405 | ||||
| * | | Only renders empty state for pipelines table if no pipelines are received ↵ | Filipa Lacerda | 2017-05-16 | 3 | -16/+40 |
|/ / | | | | | | | when request is made | ||||
* | | Merge branch 'environments-button-open-same-tab' into 'master' | Annabel Dunstone Gray | 2017-05-16 | 2 | -1/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | Removed the target=_blank from the monitoring component Closes #32243 See merge request !11386 | ||||
| * | | Removed the target=_blank from the monitoring componentenvironments-button-open-same-tab | Jose Ivan Vargas | 2017-05-15 | 2 | -1/+5 |
| | | | |||||
* | | | Merge branch 'patch-20' into 'master' | Rémy Coutable | 2017-05-16 | 2 | -2/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | #32340 - Include mention of "manual" scope in jobs api doc Closes #32340 See merge request !11411 | ||||
| * | | | #32340 - Include mention of "manual" scope in jobs api doc | Zac Sturgess | 2017-05-16 | 2 | -2/+6 |
|/ / / | |||||
* | | | Merge branch 'cherry-pick-0663458c' into 'master' | Douwe Maan | 2017-05-16 | 25 | -121/+125 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events`, take 2. Closes #31620 See merge request !11403 | ||||
| * | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458c | Douwe Maan | 2017-05-16 | 25 | -121/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
* | | | | Merge branch 'docs-add-more-conventions-for-docs-only-tests' into 'master' | Rémy Coutable | 2017-05-16 | 2 | -8/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add more choices to name the branch for docs only tests See merge request !11413 | ||||
| * | | | | Add more choices to name the branch for docs only tests | Achilleas Pipinellis | 2017-05-16 | 2 | -8/+15 |
| | | | | | | | | | | | | | | | | | | | | http://rubular.com/r/51mKdLm6RF | ||||
* | | | | | Merge branch 'pms-uxguide-monospace-git-refs' into 'master' | Achilleas Pipinellis | 2017-05-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update UX guide to use monospace type for commit, branch, and tag refs See merge request !11342 | ||||
| * | | | | | Update UX guide to use monospace type for commit, branch, and tag refspms-uxguide-monospace-git-refs | Pedro Moreira da Silva | 2017-05-15 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch '31386-profile-fix-externallinks' into 'master' | Douwe Maan | 2017-05-16 | 2 | -2/+20 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make Twitter Link on Profile page useable by fixing wrong target URL's" Closes #31386 See merge request !10931 | ||||
| * | | | | | Fixed Regex(es) | Tim Zallmann | 2017-05-11 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fixing Static Analysis Fail with Indentation | Tim Zallmann | 2017-05-08 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Created Application Helpers based on suggestion for easier parsing | Tim Zallmann | 2017-05-08 | 2 | -2/+21 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/31386-profile-fix-externallinks' into ↵ | Tim Zallmann | 2017-05-08 | 0 | -0/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 31386-profile-fix-externallinks | ||||
| | * | | | | | Doing the commit again with the correct E-Mail address setup31386-profile-fix-externallinks | Tim Zallmann | 2017-04-26 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Replacing Base URL's if they have been entered into the profile | Tim Zallmann | 2017-04-26 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Doing the commit again with the correct E-Mail address setup | Tim Zallmann | 2017-05-08 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Replacing Base URL's if they have been entered into the profile | Tim Zallmann | 2017-05-08 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'ee_compat_check-include-git-apply-reject-suggestion' into ↵ | Rémy Coutable | 2017-05-16 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update ee_compat_check.rb to include `git apply --reject` suggestion See merge request !11321 | ||||
| * | | | | | | | Update ee_compat_check.rb to include `git apply --reject` suggestion | Luke "Jared" Bennett | 2017-05-16 | 1 | -0/+11 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '30827-changes-to-audit-log' into 'master' | Phil Hughes | 2017-05-16 | 9 | -12/+17 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Personal Audit Log Closes #30827 See merge request !11400 | ||||
| * | | | | | | | Rename Personal Audit Log | Tim Zallmann | 2017-05-16 | 9 | -12/+17 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'add-right-margin-to-ci-error-icon' into 'master' | Fatih Acet | 2017-05-16 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ci-error class and applied a right margin to the ci error widget state See merge request !11353 | ||||
| * | | | | | | | Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-icon | Luke "Jared" Bennett | 2017-05-13 | 2 | -1/+5 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '32033-fix-login-usernamelabel' into 'master' | Tim Zallmann | 2017-05-16 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""Username or email" label on login form does not point to its corresponding input field" Closes #32033, #31709, and #32034 See merge request !11292 | ||||
| * | | | | | | | Resolve ""Username or email" label on login form does not point to its ↵ | Tim Zallmann | 2017-05-16 | 2 | -3/+3 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | corresponding input field" | ||||
* | | | | | | | Merge branch 'winh-autocomplete-error' into 'master' | Phil Hughes | 2017-05-16 | 5 | -54/+76 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace broken autocomplete field for new tags with dropdown Closes #32127 See merge request !11290 | ||||
| * | | | | | | | Replace broken autocomplete field for new tags with dropdown | Winnie Hellmann | 2017-05-16 | 5 | -54/+76 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '32303-nav-z-index' into 'master' | Fatih Acet | 2017-05-16 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add higher z-index to fixed nav Closes #32303 See merge request !11393 | ||||
| * | | | | | | | Add higher z-index to fixed nav32303-nav-z-index | Annabel Dunstone Gray | 2017-05-15 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'spec-joining-it' into 'master' | Rémy Coutable | 2017-05-16 | 4 | -30/+46 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Spec optimization] Joining one-line 'it' blocks See merge request !11372 | ||||
| * | | | | | | | | [Spec optimization] Joining one-line 'it' blocksspec-joining-it | Valery Sizov | 2017-05-15 | 4 | -30/+46 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '32125-fix-link-to-note-in-diff' into 'master' | Fatih Acet | 2017-05-16 | 4 | -62/+91 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking to resolved note in diff Closes #32125 See merge request !11327 | ||||
| * | | | | | | | | | Fix linking to resolved note in diff32125-fix-link-to-note-in-diff | Eric Eastwood | 2017-05-12 | 4 | -62/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125 | ||||
* | | | | | | | | | | Merge branch 'zj-pipeline-schedule-owner' into 'master' | Kamil Trzciński | 2017-05-16 | 7 | -21/+92 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foreign key for Pipeline schedule owner Closes #31932 See merge request !11233 | ||||
| * | | | | | | | | | | Add foreign key on pipeline_schedules.owner_idzj-pipeline-schedule-owner | Z.J. van de Weg | 2017-05-15 | 2 | -1/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set to nullify, so the settings remain if the user is deleted. Fixes gitlab-org/gitlab-ce#31932 | ||||
| * | | | | | | | | | | Do not schedule pipelines if the user can't | Z.J. van de Weg | 2017-05-15 | 5 | -20/+55 |
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the owner of a pipelines schedule was either blocked or was removed from the project, the pipeline schedular would still schedule the pipeline. This would than fail however, given the user had no access to the project and it contents. However, a better way to handle it would be to not schedule it at all. Furthermore, from now on, such schedules will be deactivated so the schedule worker can ignore it on the next runs. | ||||
* | | | | | | | | | | Merge branch ↵ | Kamil Trzciński | 2017-05-16 | 3 | -3/+10 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache' into 'master' Resolve "Speed up `yarn install` in CI by utilizing inter-pipeline cache" Closes #32219 See merge request !11343 | ||||
| * | | | | | | | | | | alter cache key to prevent other pipeline configs from overwriting32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache | Mike Greiling | 2017-05-16 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add CHANGELOG.md entry for !11343 | Mike Greiling | 2017-05-16 | 1 | -0/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add trailing slash to .yarn-cache to clearly identify it as a directory | Mike Greiling | 2017-05-16 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | instruct yarn to utilize the persistant .yarn-cache directory | Mike Greiling | 2017-05-16 | 2 | -2/+5 |
| | | | | | | | | | | |