summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert removing builds tab on '8-16-stable'fix/revert-removing-build-tab-againGrzegorz Bizon2017-01-2021-25/+141
| | | | | | | | This reverts commit 79a816f3bca839aadbaf7af92ac0c0d30dc8a8b7, reversing changes made to 68d89aa96b1ae7ea742cc5ac708bd8d08492826b. Conflicts: app/views/projects/merge_requests/_show.html.haml
* Update VERSION to 8.16.0-rc4v8.16.0-rc4Robert Speicher2017-01-191-1/+1
|
* Merge branch 'rs-revert-sassc' into 'master' Robert Speicher2017-01-193-17/+8
| | | | | | | Revert "Merge branch 'switch-to-sassc' into 'master'" Closes #26762 See merge request !8642
* Merge commit 'e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1' into 8-16-stableJames Lopez2017-01-1910-35/+76
|\ | | | | | | | | # Conflicts: # app/assets/javascripts/vue_pipelines_index/stage.js.es6
| * Merge branch 'switch-to-sassc' into 'master' Robert Speicher2017-01-173-8/+17
| |\ | | | | | | | | | | | | | | | | | | Switch to sassc-rails Closes #18432 See merge request !8556
| | * Switch to sassc-railsRichard Macklin2017-01-163-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18432 This uses sassc to compile the application's SASS so it compiles faster. Without attempting to be very scientific here are some numbers I got: Using sassc-rails: ``` [1] pry(main)> Benchmark.bm { |bm| bm.report { Rails.application.assets["application.css"] } } user system total real 1.430000 0.380000 1.810000 ( 1.830753) ``` Using sass-rails: ``` [1] pry(main)> Benchmark.bm { |bm| bm.report { Rails.application.assets["application.css"] } } user system total real 12.320000 0.530000 12.850000 ( 12.909684) ``` The result is faster page loads when changing CSS in development and faster precompilation.
| * | Merge branch '19633-remove-rerun' into 'master' Robert Speicher2017-01-173-15/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove rerun since it's not used anymore Closes #19633 See merge request !8598
| | * | Remove rerun since it's not used anymore19633-remove-rerunRémy Coutable2017-01-163-15/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'refresh-authorizations-tighter-lease' into 'master' Robert Speicher2017-01-173-41/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synchronize all project authorization refreshing work using a lease Closes #25987 See merge request !8599
| | * | | Synchronize all project authorization refreshingrefresh-authorizations-tighter-leaseYorick Peterse2017-01-163-41/+44
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously a lease would only be obtained to update data. This could lead to duplicate data being inserted, triggering a UNIQUE constraint error. To work around this we now acquire a lease before performing _any_ project authorization work, releasing it at the very end. Fixes #25987
| * | | Merge branch 'boards-sidebar-spec-fix' into 'master' Rémy Coutable2017-01-171-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed random issue boards sidebar failure Closes #26751 See merge request !8602
| | * | | Fixed random issue boards sidebar failureboards-sidebar-spec-fixPhil Hughes2017-01-161-1/+3
| | |/ /
| * | | Merge branch '26492-fix-transient-failure-in-commits_spec' into 'master' Robert Speicher2017-01-162-3/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Update ffaker to ~>2.4 to avoid generating names with suffixes Closes #26492 See merge request !8596
| | * | Update ffaker to ~>2.4 to avoid generating names with suffixes26492-fix-transient-failure-in-commits_specRémy Coutable2017-01-162-3/+3
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Merge branch '26616-fix-search-group-project-filters' into 'master' Alfredo Sumaran2017-01-164-1/+30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix search group/project filtering to show results Closes #26616 See merge request !8565
| | * | Fix dropdown filter input value after blur26616-fix-search-group-project-filtersEric Eastwood2017-01-164-2/+25
| | | |
| | * | Fix group/project filters on search pageEric Eastwood2017-01-162-1/+7
| | | |
| * | | Merge branch 'pipeline_index_mini_graph_fix' into 'master' Fatih Acet2017-01-161-13/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Pipeline Index Mini Graph Fix See merge request !8542
| | * | | phil said this is good - no need to dynamically update since this is a ↵pipeline_index_mini_graph_fixRegis2017-01-151-49/+7
| | | | | | | | | | | | | | | | | | | | static page for now
| | * | | works in browsers without sourceCapabilities APIRegis2017-01-151-1/+4
| | | | |
| | * | | update commented documentation to reflect new changesRegis2017-01-151-2/+3
| | | | |
| | * | | Merge branch 'master' into pipeline_index_mini_graph_fixRegis2017-01-151-1/+1
| | |\ \ \
| | * | | | fix clicking url bar, browser UI, dev tools collapsing the mini_graphRegis2017-01-151-1/+3
| | | | | |
| | * | | | fix UI without Promise or timeOut/intervalRegis2017-01-151-2/+9
| | | | | |
| | * | | | fix UI behaviourRegis2017-01-151-1/+1
| | | | | |
| | * | | | Merge branch 'master' into pipeline_index_mini_graph_fixRegis2017-01-15245-2922/+8355
| | |\ \ \ \
| | * | | | | make tests pass - change a bit of logicRegis2017-01-121-6/+8
| | | | | | |
| | * | | | | fixed issue - description in function (check diff)Regis2017-01-121-3/+23
| | | | | | |
| * | | | | | Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master' Robert Speicher2017-01-167-114/+85
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure updating project settings shows a flash message on success See merge request !8579
| | * | | | | | Add a spec and actually display the flash noticeRémy Coutable2017-01-166-116/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | Fix to display notice when project settings updated.sandish chen2017-01-154-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change validity checking for UpdateService. Add return value for project update service. Return 302(redirect_to) when successfully updated. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Merge branch '26207-add-hover-animations' into 'master' Annabel Dunstone Gray2017-01-1612-9/+145
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add Hover animations" Closes #26207 See merge request !8415
| | * | | | | | | fixed nav-links margin with recommended fixdimitrieh2017-01-161-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove margin on mobile links
| | * | | | | | | Merge branch 'master' into '26207-add-hover-animations'Dimitrie Hoekstra2017-01-05220-1249/+11735
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/variables.scss
| | * | | | | | | | added the same to .header-user-avatar to make it consistentdimitrieh2017-01-052-1/+11
| | | | | | | | | |
| | * | | | | | | | made avatar border color really subtle and not distracting, plus doesn't act ↵dimitrieh2017-01-052-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on not links anymore
| | * | | | | | | | fixed bell transition animationdimitrieh2017-01-041-1/+1
| | | | | | | | | |
| | * | | | | | | | removed darkening hover state and animation color labelsdimitrieh2017-01-042-8/+0
| | | | | | | | | |
| | * | | | | | | | fix rake scss linting errorsdimitrieh2017-01-033-5/+5
| | | | | | | | | |
| | * | | | | | | | added changelogdimitrieh2017-01-031-0/+4
| | | | | | | | | |
| | * | | | | | | | added additional hover animations, fixed up avatarsdimitrieh2017-01-039-5/+61
| | | | | | | | | |
| | * | | | | | | | hover animations for award buttons, buttons, dropdowns, rows in file list, ↵dimitrieh2017-01-034-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | links, navigation tabs, labels
| * | | | | | | | | Merge branch '25946-manual-pipeline-dropdown-casing' into 'master' Alfredo Sumaran2017-01-165-6/+10
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retain original casing for build name in manual pipeline dropdown Closes #25946 See merge request !8387
| | * | | | | | | | Retain original casing for build name in manual pipeline dropdown25946-manual-pipeline-dropdown-casingSam Rose2017-01-165-6/+10
| | | | | | | | | |
| * | | | | | | | | Merge branch 'fix/rc-migration-typo' into 'master' Rémy Coutable2017-01-163-30/+58
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yet another dot git migration fix See merge request !8592
| | * | | | | | | | | fix typo, added relevant specfix/rc-migration-typoJames Lopez2017-01-163-30/+58
| | | | | | | | | | |
| * | | | | | | | | | Merge branch '22111-remove-lock-icon-on-protected-tag' into 'master' Clement Ho2017-01-162-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Lock Icon on Protected Tag Closes #22111 See merge request !8513
| | * | | | | | | | | | Remove Lock Icon on Protected TagSergey Nikitin2017-01-142-1/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'fix/diff-title' into 'master' Alfredo Sumaran2017-01-165-26/+55
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue with diff comments path See merge request !7819
| | * | | | | | | | | | fixed commit diff linking and added specsfix/diff-titleLuke "Jared" Bennett2017-01-145-26/+55
| | | | | | | | | | | |
View Lorry Controller Status