Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix issue creation from milestone doesn't assign the milestone | wendy0402 | 2017-02-12 | 1 | -1/+9 |
| | |||||
* | Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master' | Annabel Dunstone Gray | 2017-02-11 | 1 | -0/+7 |
|\ | | | | | | | | | | | | | Resolve "Improve blockquote formatting in notification emails" Closes #28029 See merge request !9157 | ||||
| * | Stylize blockquote in notification emails | Alfredo Sumaran | 2017-02-10 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'clean-javascript-vendor-files' into 'master' | Filipa Lacerda | 2017-02-11 | 5 | -5/+5 |
|\ \ | | | | | | | | | | | | | Convert some vendored javascript assets to npm modules See merge request !8990 | ||||
| * | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-files | Mike Greiling | 2017-02-11 | 3 | -3/+3 |
| | | | |||||
| * | | convert timeago.js dependency to an npm module | Mike Greiling | 2017-02-11 | 2 | -2/+2 |
| |/ | |||||
* | | Merge branch '27994-fix-mr-widget-jump' into 'master' | Filipa Lacerda | 2017-02-10 | 2 | -6/+6 |
|\ \ | |/ |/| | | | | | | | | | fixes MR widget jump Closes #27994 See merge request !9146 | ||||
| * | Merge branch 'master' into 27994-fix-mr-widget-jump | Filipa Lacerda | 2017-02-10 | 23 | -57/+77 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' " Fix broken test to use trigger in order to not take tooltip overlaping in consideration Fix job to pipeline renaming Added env external link and light web terminal spec Don't perform Devise trackable updates on blocked User records Replace teaspoon references with Karma Add changelog Only show MR widget graph if there are stages Remove orange caret icon from mr widget Add index to ci_trigger_requests for commit_id rspec_profiling: Discover the correct branch name in GitLab CI Show parent group members for nested group Fix tooltip scss for anchors. Adds css for button's tooltips to have similar behavior. Removes padding from mini graph table cell to guarantee stages don't break line on hover Updated protected branches dropdown image in docs Fix admin_labels_spec.rb transient failure Make sure events have most properties defined Restore exposure of legend property for events moved hyperlink reference section at the end of the content Make sure our current .gitlab-ci.yml is valid adds changelog ... | ||||
| * | | fixes MR widget jump | Nur Rony | 2017-02-10 | 2 | -6/+6 |
| | | | |||||
* | | | Add js prefix to right sidebar | Annabel Dunstone Gray | 2017-02-10 | 5 | -5/+8 |
| | | | |||||
* | | | Replace accidentally deleted metaclick | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+8 |
| | | | |||||
* | | | Remove right padding from navbar-collapse on large screens | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+4 |
| | | | |||||
* | | | common_utils merge conflicts | Annabel Dunstone Gray | 2017-02-10 | 1 | -3/+1 |
| | | | |||||
* | | | Set sidebar height to 100% if at top of page | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+2 |
| | | | |||||
* | | | Set height of fixed sidebars with js | Annabel Dunstone Gray | 2017-02-10 | 2 | -1/+11 |
| | | | |||||
* | | | Add sticky sidebar on wiki page | Annabel Dunstone Gray | 2017-02-10 | 2 | -2/+2 |
| | | | |||||
* | | | Fix issue boards sidebar alignment and sidebar toggle spec | Annabel Dunstone Gray | 2017-02-10 | 1 | -5/+1 |
| | | | |||||
* | | | Fix build sidebar scrolling | Annabel Dunstone Gray | 2017-02-10 | 1 | -16/+0 |
| | | | |||||
* | | | Refactor JS | Annabel Dunstone Gray | 2017-02-10 | 1 | -3/+1 |
| | | | |||||
* | | | Fix pinned sidebar alignment | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | | |||||
* | | | Remove navbar height offsets | Annabel Dunstone Gray | 2017-02-10 | 4 | -30/+5 |
| | | | |||||
* | | | Keep sidebars absolute until fixed at top; remove unneeded JS | Annabel Dunstone Gray | 2017-02-10 | 8 | -17/+21 |
| | | | |||||
* | | | Fix sidebar scrolling | Annabel Dunstone Gray | 2017-02-10 | 2 | -2/+12 |
| | | | |||||
* | | | Remove fixed positioning from navbar | Annabel Dunstone Gray | 2017-02-10 | 3 | -6/+2 |
| |/ |/| | |||||
* | | Merge branch '27987-skipped-pipeline-mr-graph' into 'master' | Alfredo Sumaran | 2017-02-10 | 1 | -2/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Only show MR widget graph if there are stages Closes #27987 See merge request !9141 | ||||
| * | | Only show MR widget graph if there are stages | Annabel Dunstone Gray | 2017-02-10 | 1 | -2/+3 |
| |/ | |||||
* | | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' " | Alfredo Sumaran | 2017-02-10 | 7 | -139/+29 |
| | | | | | | | | | | This reverts commit b7c5ca499d9c26494736d92505116bbb294c63d6, reversing changes made to 9745c98bb77a1a1ddd964f58cc4d058a665eb9ee. | ||||
* | | Merge branch '27963-tooltips-jobs' into 'master' | Annabel Dunstone Gray | 2017-02-10 | 1 | -4/+10 |
|\ \ | | | | | | | | | | | | | | | | | | | Fixes tooltips in mini pipeline graph Closes #27963 and #28008 See merge request !9140 | ||||
| * \ | Merge branch 'master' into 27963-tooltips-jobs | Filipa Lacerda | 2017-02-10 | 8 | -15/+30 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove orange caret icon from mr widget Add index to ci_trigger_requests for commit_id rspec_profiling: Discover the correct branch name in GitLab CI Show parent group members for nested group Updated protected branches dropdown image in docs Fix admin_labels_spec.rb transient failure Make sure our current .gitlab-ci.yml is valid Show Pipeline(not Job) in MR desktop notification Make min width smaller for user settings | ||||
| * | | | Fix tooltip scss for anchors. | Filipa Lacerda | 2017-02-10 | 1 | -4/+10 |
| | |/ | |/| | | | | | | | | | | Adds css for button's tooltips to have similar behavior. Removes padding from mini graph table cell to guarantee stages don't break line on hover | ||||
* | | | Merge branch 'fix-job-to-pipeline-renaming' into 'master' | Douwe Maan | 2017-02-10 | 4 | -7/+7 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix job to pipeline renaming Closes #28016 See merge request !9147 | ||||
| * | | | Fix job to pipeline renaming | Filipa Lacerda | 2017-02-10 | 4 | -7/+7 |
| | | | | |||||
* | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' | Alfredo Sumaran | 2017-02-10 | 7 | -29/+139 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Small improvements for Cycle Analytics See merge request !9126 | ||||
| * | | | | Make sure events have most properties defined | Alfredo Sumaran | 2017-02-10 | 5 | -28/+137 |
| | | | | | |||||
| * | | | | Restore exposure of legend property for events | Alfredo Sumaran | 2017-02-10 | 2 | -1/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'rs-warden-blocked-users' into 'master' | Robert Speicher | 2017-02-10 | 7 | -22/+16 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't perform Devise trackable updates on blocked User records Closes #27519 See merge request !8915 | ||||
| * | | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-users | Robert Speicher | 2017-02-10 | 7 | -22/+16 |
| | | | | | |||||
* | | | | | Merge branch 'issue-newproj-layout' into 'master' | Rémy Coutable | 2017-02-10 | 2 | -7/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate "Visibility Level" label on New Project page See merge request !8272 | ||||
| * | | | | | Removed duplicate "Visibility Level" label on New Project page | Robert Marcano | 2017-02-09 | 2 | -7/+9 |
| | | | | | | |||||
* | | | | | | Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' | Kamil Trzciński | 2017-02-10 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add environment URL link to terminal page" Closes #27336 See merge request !9107 | ||||
| * | | | | | Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-page | Luke "Jared" Bennett | 2017-02-10 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' | Dmitriy Zaporozhets | 2017-02-10 | 5 | -5/+27 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nested groups members page See merge request !9062 | ||||
| * | | | | | | Show parent group members for nested groupdz-nested-groups-members-page | Dmitriy Zaporozhets | 2017-02-10 | 5 | -5/+27 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Merge branch '27991-success-with-warnings-caret' into 'master' | Alfredo Sumaran | 2017-02-10 | 1 | -7/+0 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove orange caret icon from MR widget Closes #27991 See merge request !9137 | ||||
| * | | | | | Remove orange caret icon from mr widget27991-success-with-warnings-caret | Annabel Dunstone Gray | 2017-02-10 | 1 | -7/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'user-dropdown-settings' into 'master' | Alfredo Sumaran | 2017-02-10 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Make min width smaller for user settings See merge request !9112 | ||||
| * | | | | Make min width smaller for user settingsuser-dropdown-settings | Annabel Dunstone Gray | 2017-02-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Show Pipeline(not Job) in MR desktop notification | Eric Eastwood | 2017-02-10 | 1 | -2/+2 |
| |/ / / |/| | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27955 | ||||
* | | | | Merge branch 'protected-branch-dropdown-titles' into 'master' | Jacob Schatz | 2017-02-10 | 1 | -2/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added header to protected branches access dropdowns See merge request !8774 | ||||
| * | | | | Added header to protected branches access dropdownsprotected-branch-dropdown-titles | Phil Hughes | 2017-01-26 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294 |