summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add CHAGELOG.md entry for webpack branchMike Greiling2017-01-291-0/+4
|
* fix failing rspec buildMike Greiling2017-01-281-4/+4
|
* fix test failure for merge request widgetMike Greiling2017-01-281-1/+1
|
* fix duplicate data-toggle attributeMike Greiling2017-01-281-2/+0
|
* update rake tasksMike Greiling2017-01-282-2/+2
|
* fix frontend testsMike Greiling2017-01-282-10/+21
|
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-2859-135/+651
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (33 commits) Improved code style on the issue_sidebar_spec.rb add CHAGELOG.md entry for !8831 remove assets:compile step from relative_url docs update scripts and docs to reference the newly namespaced rake task namespace assets rake tasks to gitlab:assets:* correct gzip files if they exist as well automatically correct CSS urls on assets:precompile remove hard-coded assets path for ace editor modules Fixed cancel button in the services form not redirecting back to the integrations settings view Fix search bar search param encoding Fix a transient failure in the `Explore::ProjectsController` spec Fix filtering with multiple words Fix project name label's for reference in project settings Fixed merge request tabs extra margin Don't call `#uniq` on a relation Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/ Move ApplicationSetting DEFAULTS to `.defaults` instead Move a begin/rescue clause to ApplicationSetting.expire Use badge partial as single source of truth instead of having 2 partials doing the same Changes after review ...
| * Merge branch 'relative-url-assets' into 'master' Jacob Schatz2017-01-2713-19/+88
| |\ | | | | | | | | | | | | Remove hard-coded absolute URLs from all frontend assets See merge request !8831
| | * add CHAGELOG.md entry for !8831Mike Greiling2017-01-271-0/+4
| | |
| | * remove assets:compile step from relative_url docsMike Greiling2017-01-271-8/+0
| | |
| | * 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 'issuable-sidebar-bug' into 'master' Alfredo Sumaran2017-01-275-9/+51
| |\ \ | | | | | | | | | | | | | | | | Fixed Issuable sidebar so it remains closed on mobile/smaller screen devices See merge request !7466
| | * | Improved code style on the issue_sidebar_spec.rbJose Ivan Vargas2017-01-271-10/+11
| | | |
| | * | Moved the turbolinks listener from application.js to the corresponding ↵Jose Ivan Vargas2017-01-252-8/+9
| | | | | | | | | | | | | | | | issuable sidebar file
| | * | Fixed Issuable sidebar so it remains closed on mobile/smaller screen devicesJose Ivan Vargas Lopez2017-01-254-10/+50
| | | | | | | | | | | | | | | | | | | | | | | | Added test to replicate the bug, also added a couple of helpers that can be reused on the testing suite to resize the browser window, these helpers are located on the spec/support/mobile_helpers.rb
| * | | Merge branch ↵Filipa Lacerda2017-01-273-2/+168
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27248-filtered-search-does-not-allow-filtering-labels-with-multiple-words' into 'master' Fix filtering label and milestone with multiple words Closes #27248 and #27334 See merge request !8830
| | * | Fix filtering with multiple words27248-filtered-search-does-not-allow-filtering-labels-with-multiple-wordsClement Ho2017-01-273-2/+168
| | | |
| * | | 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
View Lorry Controller Status