summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-279-11/+11
|
* namespace assets rake tasks to gitlab:assets:*Mike Greiling2017-01-272-29/+47
|
* correct gzip files if they exist as wellMike Greiling2017-01-271-0/+19
|
* automatically correct CSS urls on assets:precompileMike Greiling2017-01-271-0/+10
|
* remove hard-coded assets path for ace editor modulesMike Greiling2017-01-272-1/+27
|
* Merge branch '27280-fix-unititalized-constant' into 'master' Robert Speicher2017-01-276-59/+54
|\ | | | | | | | | | | | | Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS" Closes #27280 See merge request !8805
| * Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constantRémy Coutable2017-01-273-6/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Move ApplicationSetting DEFAULTS to `.defaults` insteadRémy Coutable2017-01-272-46/+50
| | | | | | | | | | | | This will avoid autoloading issues in the long term. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Move a begin/rescue clause to ApplicationSetting.expireRémy Coutable2017-01-272-7/+4
| | | | | | | | | | | | Also, remove non-existing Ci::ApplicationSetting.expire! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch ↵Fatih Acet2017-01-272-1/+57
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '26448-unnecessary-request-is-made-when-filter-input-box-is-focused-by-keyboard' into 'master' Only search commits on input change since last search Closes #26448 See merge request !8488
| * | Only search commits on input change since last search26448-unnecessary-request-is-made-when-filter-input-box-is-focused-by-keyboardSam Rose2017-01-252-1/+57
| | |
* | | Merge branch 'fix-search-bar-search-param' into 'master' Filipa Lacerda2017-01-273-1/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix search bar search param encoding Closes #27398 See merge request !8753
| * | | Fix search bar search param encodingfix-search-bar-search-paramClement Ho2017-01-273-1/+74
| | | |
* | | | Merge branch 'contribution-calendar-scroll' into 'master' Clement Ho2017-01-273-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Contribution calendar now scrolls right by default See merge request !6192
| * | | | Added ltr direction for the calendar contribution month rowJose Ivan2017-01-261-2/+2
| | | | |
| * | | | Reverted the change from .second-block to .calender-blockJose Ivan2017-01-254-2/+6
| | | | |
| * | | | Contribution calendar now scrolls right by defaultJosé Iván2017-01-251-0/+1
| | | | |
* | | | | Merge branch 'ui-updates' into 'master' Fatih Acet2017-01-275-8/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | UI updates See merge request !8669
| * | | | | Add tooltip to subscribe btnui-updatesAnnabel Dunstone Gray2017-01-261-1/+1
| | | | | |
| * | | | | Fix subscribe btn testAnnabel Dunstone Gray2017-01-241-1/+1
| | | | | |
| * | | | | Speed up animation transition; add hover state to top right iconsAnnabel Dunstone Gray2017-01-243-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Remove subscribe text from button
| * | | | | Darken repo links on hover; fix clone input heightAnnabel Dunstone Gray2017-01-241-2/+2
| | | | | |
* | | | | | Merge branch '23034-enable-rspec-profiling' into 'master' Robert Speicher2017-01-275-0/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rspec_profiling to the rspec environment Closes #23034 See merge request !7854
| * | | | | | Add the rspec_profiling gem and documentation to the GitLab development ↵23034-enable-rspec-profilingNick Thomas2017-01-275-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | environment
* | | | | | | Merge branch 'fix-cancel-integration-settings' into 'master' Clement Ho2017-01-272-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed cancel button in the services form not redirecting back to the integrations settings view Closes #27301 See merge request !8843
| * | | | | | | Fixed cancel button in the services form not redirecting back to the ↵fix-cancel-integration-settingsJose Ivan Vargas2017-01-272-1/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | integrations settings view
* | | | | | | Merge branch '27259-label-for-references-the-wrong-associated-text-input' ↵Annabel Dunstone Gray2017-01-273-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix project name label's for reference in project settings Closes #27259 See merge request !8795
| * | | | | | | Fix project name label's for reference in project settings27259-label-for-references-the-wrong-associated-text-inputClement Ho2017-01-273-3/+7
| | | | | | | |
* | | | | | | | Merge branch 'rs-issue-27350' into 'master'Rémy Coutable2017-01-271-14/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a transient failure in the `Explore::ProjectsController` spec Closes #27350 See merge request !8847
| * | | | | | | | Fix a transient failure in the `Explore::ProjectsController` specrs-issue-27350Robert Speicher2017-01-271-14/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'speed-up-members-dropdown' into 'master' Douwe Maan2017-01-271-3/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call `#uniq` on a relation See merge request !8784
| * | | | | | | | | Don't call `#uniq` on a relationSean McGivern2017-01-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there was no project, no search, and no current user or author param, the AutocompleteController would call `#uniq!` on a relation instead of an array. This performed the less-efficient `SELECT DISTINCT` when it wasn't even needed (because the query wouldn't return duplicates anyway - duplicates were only added by putting a user on top of the list).
* | | | | | | | | | Merge branch '26947-build-status-self-link' into 'master' Kamil Trzciński2017-01-274-3/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new partial to render a badge without a link in the builds details. Closes #26947 See merge request !8740
| * | | | | | | | | | Use badge partial as single source of truth instead of having 2 partials ↵26947-build-status-self-linkFilipa Lacerda2017-01-279-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doing the same Update changelog description Changes after review
| * | | | | | | | | | Changes after reviewFilipa Lacerda2017-01-272-3/+5
| | | | | | | | | | |
| * | | | | | | | | | Adds tests to build viewFilipa Lacerda2017-01-273-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CHANGELOG entry
| * | | | | | | | | | Use new partial to render a badge without a link in the builds details. ↵Filipa Lacerda2017-01-278-14/+23
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preventing from having a link to itself. Adds MR ID to CHANGELOG entry
* | | | | | | | | | Merge branch 'mr-tabs-container-offset' into 'master' Annabel Dunstone Gray2017-01-274-13/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed merge request tabs extra margin Closes #26853 See merge request !8841
| * | | | | | | | | Fixed merge request tabs extra marginPhil Hughes2017-01-274-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed extra margin when the merge request tabs are affixed This was caused by some weird padding that was on the container & then not correctly removed. The fix involved removing the container from inside the tabs holder div & then adding the widths through CSS depending on if fixed & whether the parent is limited width or not. In reality out container classes need to be fixed as it is getting pretty un-managable at the moment this should of been an easy fix, but in reality turned into something much harder. Closes #26853
* | | | | | | | | | Merge branch 'sh-fix-annotated-tags-pointing-to-blob' into 'master' Douwe Maan2017-01-273-1/+40
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when repositories contain annotated tags pointing to blobs Closes #27228 See merge request !8800
| * | | | | | | | | Fix Error 500 when repositories contain annotated tags pointing to blobssh-fix-annotated-tags-pointing-to-blobStan Hu2017-01-263-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In repositories such as https://github.com/git/git.git, annotated tags can point to blobs, not necessarily to commits. `Repository` attempts to return the tags in the order of the commit date, but if a commit is not available the previous implementation would error due to a `nil` target. This change modifies the code to use the current time if a commit is not associated with the given tag. Closes #27228
* | | | | | | | | | Merge branch ↵26900-pipelines-tabs-equal-buildsRémy Coutable2017-01-272-228/+91
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'get-rid-of-water-from-notification_service_spec-to-make-it-DRY' into 'master' Make notification_service spec DRYer by making some tests reusable See merge request !7794
| * | | | | | | | | Make notification_service spec DRYer by making some tests reusableYarNayar2016-12-122-228/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec for 'participatns' notifications in notification_service for both issue and merge_request is pretty simple but it was fully copied without sagnificant changes 8 times (!!!) for EVERY situation you need to notify this group of user which caused to file to extra growth and not being very DRY. And I love DRY. Since the spec is already too messy and most likely gonna to increase the size nearest time, I decided to refactor those parts.
* | | | | | | | | | Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-277-21/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't override Ci::Build#user when presenting a build Closes #26943 See merge request !8668
| * | | | | | | | | | Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee ↵26943-fix-user-in-build-presenterRémy Coutable2017-01-253-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already respond to method Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-246-22/+27
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'gemfile-development-guideline' into 'master' Stan Hu2017-01-272-0/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document "No gems fetched from git repositories" policy [ci skip] See merge request !8818
| * | | | | | | | | | Document "No gems fetched from git repositories" policy [ci skip]Adam Niedzielski2017-01-272-0/+15
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-empty_project-models' into 'master'Rémy Coutable2017-01-2766-146/+148
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `:empty_project` where possible in model specs See merge request !8832
| * | | | | | | | | | | Use `:empty_project` where possible in model specsrs-empty_project-modelsRobert Speicher2017-01-2666-146/+148
| | | | | | | | | | | |
View Lorry Controller Status