Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactored 1 iteration of cycle analytics and stages in generalrefactor-cycle-analytics | James Lopez | 2017-01-17 | 74 | -541/+830 |
| | |||||
* | Merge branch 'switch-to-sassc' into 'master' | Robert Speicher | 2017-01-17 | 3 | -8/+17 |
|\ | | | | | | | | | | | | | Switch to sassc-rails Closes #18432 See merge request !8556 | ||||
| * | Switch to sassc-rails | Richard Macklin | 2017-01-16 | 3 | -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 Speicher | 2017-01-17 | 3 | -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-rerun | Rémy Coutable | 2017-01-16 | 3 | -15/+0 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Merge branch 'refresh-authorizations-tighter-lease' into 'master' | Robert Speicher | 2017-01-17 | 3 | -41/+44 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Synchronize all project authorization refreshing work using a lease Closes #25987 See merge request !8599 | ||||
| * | | | Synchronize all project authorization refreshingrefresh-authorizations-tighter-lease | Yorick Peterse | 2017-01-16 | 3 | -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 Coutable | 2017-01-17 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed random issue boards sidebar failure Closes #26751 See merge request !8602 | ||||
| * | | | Fixed random issue boards sidebar failureboards-sidebar-spec-fix | Phil Hughes | 2017-01-16 | 1 | -1/+3 |
| |/ / | |||||
* | | | Merge branch '26492-fix-transient-failure-in-commits_spec' into 'master' | Robert Speicher | 2017-01-16 | 2 | -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_spec | Rémy Coutable | 2017-01-16 | 2 | -3/+3 |
|/ / | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch '26616-fix-search-group-project-filters' into 'master' | Alfredo Sumaran | 2017-01-16 | 4 | -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-filters | Eric Eastwood | 2017-01-16 | 4 | -2/+25 |
| | | | |||||
| * | | Fix group/project filters on search page | Eric Eastwood | 2017-01-16 | 2 | -1/+7 |
| | | | |||||
* | | | Merge branch 'pipeline_index_mini_graph_fix' into 'master' | Fatih Acet | 2017-01-16 | 1 | -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_fix | Regis | 2017-01-15 | 1 | -49/+7 |
| | | | | | | | | | | | | | | | | static page for now | ||||
| * | | | works in browsers without sourceCapabilities API | Regis | 2017-01-15 | 1 | -1/+4 |
| | | | | |||||
| * | | | update commented documentation to reflect new changes | Regis | 2017-01-15 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into pipeline_index_mini_graph_fix | Regis | 2017-01-15 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | fix clicking url bar, browser UI, dev tools collapsing the mini_graph | Regis | 2017-01-15 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | fix UI without Promise or timeOut/interval | Regis | 2017-01-15 | 1 | -2/+9 |
| | | | | | |||||
| * | | | | fix UI behaviour | Regis | 2017-01-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into pipeline_index_mini_graph_fix | Regis | 2017-01-15 | 245 | -2922/+8355 |
| |\ \ \ \ | |||||
| * | | | | | make tests pass - change a bit of logic | Regis | 2017-01-12 | 1 | -6/+8 |
| | | | | | | |||||
| * | | | | | fixed issue - description in function (check diff) | Regis | 2017-01-12 | 1 | -3/+23 |
| | | | | | | |||||
* | | | | | | Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master' | Robert Speicher | 2017-01-16 | 7 | -114/+85 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure updating project settings shows a flash message on success See merge request !8579 | ||||
| * | | | | | | Add a spec and actually display the flash notice | Rémy Coutable | 2017-01-16 | 6 | -116/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Fix to display notice when project settings updated. | sandish chen | 2017-01-15 | 4 | -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 Gray | 2017-01-16 | 12 | -9/+145 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add Hover animations" Closes #26207 See merge request !8415 | ||||
| * | | | | | | | fixed nav-links margin with recommended fix | dimitrieh | 2017-01-16 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove margin on mobile links | ||||
| * | | | | | | | Merge branch 'master' into '26207-add-hover-animations' | Dimitrie Hoekstra | 2017-01-05 | 220 | -1249/+11735 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/variables.scss | ||||
| * | | | | | | | | added the same to .header-user-avatar to make it consistent | dimitrieh | 2017-01-05 | 2 | -1/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | made avatar border color really subtle and not distracting, plus doesn't act ↵ | dimitrieh | 2017-01-05 | 2 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on not links anymore | ||||
| * | | | | | | | | fixed bell transition animation | dimitrieh | 2017-01-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | removed darkening hover state and animation color labels | dimitrieh | 2017-01-04 | 2 | -8/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | fix rake scss linting errors | dimitrieh | 2017-01-03 | 3 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | added changelog | dimitrieh | 2017-01-03 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | added additional hover animations, fixed up avatars | dimitrieh | 2017-01-03 | 9 | -5/+61 |
| | | | | | | | | | |||||
| * | | | | | | | | hover animations for award buttons, buttons, dropdowns, rows in file list, ↵ | dimitrieh | 2017-01-03 | 4 | -1/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | links, navigation tabs, labels | ||||
* | | | | | | | | | Merge branch '25946-manual-pipeline-dropdown-casing' into 'master' | Alfredo Sumaran | 2017-01-16 | 5 | -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-casing | Sam Rose | 2017-01-16 | 5 | -6/+10 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/rc-migration-typo' into 'master' | Rémy Coutable | 2017-01-16 | 3 | -30/+58 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yet another dot git migration fix See merge request !8592 | ||||
| * | | | | | | | | | fix typo, added relevant specfix/rc-migration-typo | James Lopez | 2017-01-16 | 3 | -30/+58 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '22111-remove-lock-icon-on-protected-tag' into 'master' | Clement Ho | 2017-01-16 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Lock Icon on Protected Tag Closes #22111 See merge request !8513 | ||||
| * | | | | | | | | | | Remove Lock Icon on Protected Tag | Sergey Nikitin | 2017-01-14 | 2 | -1/+4 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fix/diff-title' into 'master' | Alfredo Sumaran | 2017-01-16 | 5 | -26/+55 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue with diff comments path See merge request !7819 | ||||
| * | | | | | | | | | | fixed commit diff linking and added specsfix/diff-title | Luke "Jared" Bennett | 2017-01-14 | 5 | -26/+55 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fix/rc-migration-failure' into 'master' | Sean McGivern | 2017-01-16 | 1 | -20/+40 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migration failing when user has no projects See merge request !8589 | ||||
| * | | | | | | | | | | | fix typo | James Lopez | 2017-01-16 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | fix var inside loop | James Lopez | 2017-01-16 | 1 | -1/+3 |
| | | | | | | | | | | | |