summaryrefslogtreecommitdiff
Commit message (Expand)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
|\
| * Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constantRémy Coutable2017-01-273-6/+0
| * Move ApplicationSetting DEFAULTS to `.defaults` insteadRémy Coutable2017-01-272-46/+50
| * Move a begin/rescue clause to ApplicationSetting.expireRémy Coutable2017-01-272-7/+4
* | Merge branch '26448-unnecessary-request-is-made-when-filter-input-box-is-focu...Fatih Acet2017-01-272-1/+57
|\ \
| * | 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 encodingfix-search-bar-search-paramClement Ho2017-01-273-1/+74
* | | | Merge branch 'contribution-calendar-scroll' into 'master' Clement Ho2017-01-273-1/+6
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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
| * | | | | 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 the rspec_profiling gem and documentation to the GitLab development envir...23034-enable-rspec-profilingNick Thomas2017-01-275-0/+61
* | | | | | | 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 integrat...fix-cancel-integration-settingsJose Ivan Vargas2017-01-272-1/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '27259-label-for-references-the-wrong-associated-text-input' int...Annabel Dunstone Gray2017-01-273-3/+7
|\ \ \ \ \ \ \
| * | | | | | | 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` 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 relationSean McGivern2017-01-271-3/+2
* | | | | | | | | | Merge branch '26947-build-status-self-link' into 'master' Kamil Trzciński2017-01-274-3/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use badge partial as single source of truth instead of having 2 partials doin...26947-build-status-self-linkFilipa Lacerda2017-01-279-19/+17
| * | | | | | | | | | Changes after reviewFilipa Lacerda2017-01-272-3/+5
| * | | | | | | | | | Adds tests to build viewFilipa Lacerda2017-01-273-3/+29
| * | | | | | | | | | Use new partial to render a badge without a link in the builds details. Preve...Filipa Lacerda2017-01-278-14/+23
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mr-tabs-container-offset' into 'master' Annabel Dunstone Gray2017-01-274-13/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed merge request tabs extra marginPhil Hughes2017-01-274-13/+24
* | | | | | | | | | 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 blobssh-fix-annotated-tags-pointing-to-blobStan Hu2017-01-263-1/+40
* | | | | | | | | | Merge branch 'get-rid-of-water-from-notification_service_spec-to-make-it-DRY'...26900-pipelines-tabs-equal-buildsRémy Coutable2017-01-272-228/+91
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make notification_service spec DRYer by making some tests reusableYarNayar2016-12-122-228/+91
* | | | | | | | | | Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-277-21/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee already...26943-fix-user-in-build-presenterRémy Coutable2017-01-253-6/+9
| * | | | | | | | | | Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-246-22/+27
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gemfile-development-guideline' into 'master' Stan Hu2017-01-272-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 specsrs-empty_project-modelsRobert Speicher2017-01-2666-146/+148
View Lorry Controller Status