summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make cycle_analytics_events_spec.rb side-effect free26622-fix-transient-failure-in-cycle_analytics_events_specRémy Coutable2017-01-161-21/+14
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* 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
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix/rc-migration-failure' into 'master' Sean McGivern2017-01-161-20/+40
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migration failing when user has no projects See merge request !8589
| * | | | | | | | | | fix typoJames Lopez2017-01-161-1/+1
| | | | | | | | | | |
| * | | | | | | | | | fix var inside loopJames Lopez2017-01-161-1/+3
| | | | | | | | | | |
| * | | | | | | | | | fix bug in loopJames Lopez2017-01-161-6/+2
| | | | | | | | | | |
| * | | | | | | | | | cope with namespace duplicated paths in any storageJames Lopez2017-01-161-14/+18
| | | | | | | | | | |
| * | | | | | | | | | fix nil path errorfix/rc-migration-failureJames Lopez2017-01-161-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Remove rollback and fixed a couple of issuesJames Lopez2017-01-161-11/+8
| | | | | | | | | | |
| * | | | | | | | | | Fix remove dot git migration failing when user has no projectsJames Lopez2017-01-161-10/+29
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed typo - Fixed migration when there are no projects and path is nil - Added path rollback that was missing if there was a SQL error
* | | | | | | | | | Merge branch 'fix-deprecation-warning' into 'master' Rémy Coutable2017-01-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a API deprecation warning See merge request !8587
| * | | | | | | | | | Fix a API deprecation warningfix-deprecation-warningRobert Schilling2017-01-161-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'pmq20/gitlab-ce-psvr/head/cache' into 'master' Yorick Peterse2017-01-165-16/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire related caches after changing HEAD See merge request !8584
| * | | | | | | | | | Expire related caches after changing HEADpmq20/gitlab-ce-psvr/head/cacheMinqi Pan2017-01-155-16/+32
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'dot-in-project-queries' into 'master' Rémy Coutable2017-01-163-7/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a constraint on the query parameter to allow querying for projects with dots in their name. See merge request !8210
| * | | | | | | | | | Add a constraint on the query parameter to allow querying for projects with ↵Bruno Melli2017-01-143-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dots in their name.
* | | | | | | | | | | Merge branch 'move-admin-groups-spinach-test-to-rspec' into 'master' Rémy Coutable2017-01-154-198/+111
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin groups spinach tests to rspec See merge request !8313
| * | | | | | | | | | Move admin groups spinach tests to rspecSemyon Pupkov2016-12-274-198/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036