Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed the extra call to the form_errors helperfix-avatar-upload-message-error | Jose Ivan Vargas | 2017-02-10 | 1 | -1/+0 |
| | |||||
* | Added changelog entry | Jose Ivan Vargas | 2017-02-10 | 1 | -0/+4 |
| | |||||
* | Add a form_errors helper to show form erorrs should they arise on the edit ↵ | Jose Ivan Vargas | 2017-02-10 | 1 | -0/+1 |
| | | | | project view | ||||
* | Merge branch 'static-navbar' into 'master' | Jacob Schatz | 2017-02-10 | 22 | -70/+62 |
|\ | | | | | | | | | Remove fixed positioning from navbar See merge request !7547 | ||||
| * | 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 |
| | | |||||
| * | Add changelog | 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 comment button test for slash commands | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | |||||
| * | Fix time tracking spec | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+1 |
| | | |||||
| * | Fix issue boards sidebar alignment and sidebar toggle spec | Annabel Dunstone Gray | 2017-02-10 | 2 | -6/+2 |
| | | |||||
| * | Fix failing conflicts test | Annabel Dunstone Gray | 2017-02-10 | 1 | -1/+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 | 4 | -7/+3 |
|/ | |||||
* | Merge branch '27987-skipped-pipeline-mr-graph' into 'master' | Alfredo Sumaran | 2017-02-10 | 2 | -2/+7 |
|\ | | | | | | | | | | | | | Only show MR widget graph if there are stages Closes #27987 See merge request !9141 | ||||
| * | Add changelog27987-skipped-pipeline-mr-graph | Annabel Dunstone Gray | 2017-02-10 | 1 | -0/+4 |
| | | |||||
| * | Only show MR widget graph if there are stages | Annabel Dunstone Gray | 2017-02-10 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'replace-teaspoon-references' into 'master' | Clement Ho | 2017-02-10 | 4 | -22/+15 |
|\ \ | | | | | | | | | | | | | | | | | | | Replace teaspoon references with Karma Closes gitlab-com/gitlab-docs#68 See merge request !9011 | ||||
| * | | Replace teaspoon references with Karmareplace-teaspoon-references | Clement Ho | 2017-02-10 | 4 | -22/+15 |
| | | | |||||
* | | | Merge branch '27783-fix-fe-doc-broken-link' into 'master' | Filipa Lacerda | 2017-02-10 | 2 | -42/+48 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fixes frontend doc broken link Closes #27783 See merge request !9120 | ||||
| * \ \ | Merge branch 'master' into 27783-fix-fe-doc-broken-link27783-fix-fe-doc-broken-link | Filipa Lacerda | 2017-02-10 | 13 | -20/+57 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix admin_labels_spec.rb transient failure Make sure our current .gitlab-ci.yml is valid Show Pipeline(not Job) in MR desktop notification Remove a transient failure from spec/requests/api/groups_spec.rb Update PROCESS.md Update MergeRequest API state_event option documentation Rename issuable to IssueBase | ||||
| * | | | moved hyperlink reference section at the end of the content | Nur Rony | 2017-02-10 | 1 | -41/+43 |
| | | | | |||||
| * | | | adds changelog | Nur Rony | 2017-02-10 | 1 | -0/+4 |
| | | | | |||||
| * | | | fixes frontend doc broken link | Nur Rony | 2017-02-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'revert-changes-from-9126' into 'master' | Alfredo Sumaran | 2017-02-10 | 14 | -167/+29 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master'" See merge request !9152 | ||||
| * | | | | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' " | Alfredo Sumaran | 2017-02-10 | 14 | -167/+29 |
|/ / / / | | | | | | | | | | | | | | | | | This reverts commit b7c5ca499d9c26494736d92505116bbb294c63d6, reversing changes made to 9745c98bb77a1a1ddd964f58cc4d058a665eb9ee. | ||||
* | | | | Merge branch '27963-tooltips-jobs' into 'master' | Annabel Dunstone Gray | 2017-02-10 | 3 | -5/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltips in mini pipeline graph Closes #27963 and #28008 See merge request !9140 | ||||
| * | | | | Fix broken test to use trigger in order to not take tooltip overlaping in ↵ | Filipa Lacerda | 2017-02-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | consideration | ||||
| * | | | | Merge branch 'master' into 27963-tooltips-jobs | Filipa Lacerda | 2017-02-10 | 20 | -21/+160 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * \ \ \ \ | Merge branch 'master' into 27963-tooltips-jobs27963-tooltips-jobs | Filipa Lacerda | 2017-02-10 | 2 | -3/+24 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove a transient failure from spec/requests/api/groups_spec.rb | ||||
| * | | | | | | Fix tooltip scss for anchors. | Filipa Lacerda | 2017-02-10 | 2 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -7/+11 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix job to pipeline renaming Closes #28016 See merge request !9147 | ||||
| * | | | | | | | Fix job to pipeline renaming | Filipa Lacerda | 2017-02-10 | 5 | -7/+11 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' | Alfredo Sumaran | 2017-02-10 | 14 | -29/+167 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -1/+30 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rs-warden-blocked-users' into 'master' | Robert Speicher | 2017-02-10 | 11 | -76/+54 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -76/+54 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'issue-newproj-layout' into 'master' | Rémy Coutable | 2017-02-10 | 3 | -7/+13 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -7/+13 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '1051-api-create-users-without-password' into 'master' | Rémy Coutable | 2017-02-10 | 4 | -4/+33 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optionally make users created via the API set their password Closes #1051 See merge request !8957 |