summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Removed aside toggle on profile pagesprofile-aside-togglePhil Hughes2016-04-181-2/+0
| | | | Closes #13943
* Fix documentation and improve permissions codeFelipe Artur2016-04-182-1/+2
|
* Insert instructions in admin page and permissions documentFelipe Artur2016-04-181-1/+3
|
* Remove group members checkFelipe Artur2016-04-184-21/+9
|
* Insert users check into apiFelipe Artur2016-04-181-3/+3
|
* Code fixesFelipe Artur2016-04-184-27/+13
|
* Fix specsFelipe Artur2016-04-181-2/+2
|
* Fix codeFelipe Artur2016-04-183-9/+5
|
* Add specs and fix codeFelipe Artur2016-04-184-18/+24
|
* Move verification to abilitiesFelipe Artur2016-04-185-12/+47
|
* Restrict user profiles based on restricted visibility levelsFelipe Artur2016-04-182-0/+8
|
* Merge branch 'tasklist-fix' into 'master' Jacob Schatz2016-04-182-6/+0
|\ | | | | | | | | | | | | Fixed issue with tasklist toggling sidebar refresh Closes #15270 See merge request !3782
| * Fixed issue with tasklist toggling sidebar refreshtasklist-fixPhil Hughes2016-04-182-6/+0
| | | | | | | | Closes #15270
* | Merge branch 'import-feedback' into 'master' Jacob Schatz2016-04-189-41/+122
|\ \ | | | | | | | | | | | | | | | | | | Added loading icon to import buttons See #14488 for more details See merge request !3662
| * | Addressed feedbackPhil Hughes2016-04-181-3/+3
| | |
| * | Variable nameimport-feedbackPhil Hughes2016-04-141-2/+2
| | |
| * | Updated based on feedbackPhil Hughes2016-04-148-25/+25
| | |
| * | Moved loading icon to match todo loading iconPhil Hughes2016-04-127-16/+16
| | |
| * | Added loading icon to import buttonsPhil Hughes2016-04-118-39/+120
| | | | | | | | | | | | See #14488 for more details
* | | Merge branch 'print-style' into 'master' Jacob Schatz2016-04-182-13/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print style [test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf) Closes #14201 See merge request !3784
| * | | Updated print stylePhil Hughes2016-04-182-13/+33
| | |/ | |/| | | | | | | Closes #14201
* | | Merge branch 'discussion-notes' into 'master' Jacob Schatz2016-04-186-19/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion notes update - At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues - Moved the dates to be in the header like other notes - Fixed overlapping issue on mobile See merge request !3720
| * | | Fixed testsdiscussion-notesPhil Hughes2016-04-142-13/+13
| | | |
| * | | Dicussion action mobile fixPhil Hughes2016-04-141-0/+11
| | | |
| * | | Discussion notes updatePhil Hughes2016-04-147-31/+25
| | | | | | | | | | | | | | | | | | | | | | | | At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues Moved the dates to be in the header like other notes Fixed overlapping issue on mobile
* | | | Merge branch 'feature/ci-job-env-variables' into 'master' Grzegorz Bizon2016-04-181-3/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environment variables on a job level in CI Make it possible to define environment variables on a job level. Closes #14716 See merge request !3612
| * | | | Remove code that removes duplicate CI variablesGrzegorz Bizon2016-04-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | At this point this is being handled by GitLab Runner and we need to introduce this as a separate merge request.
| * | | | Rename method that returns global envs in CI confGrzegorz Bizon2016-04-181-1/+1
| | | | |
| * | | | Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-181-2/+6
| | | | |
| * | | | Make it possible to override build variablesGrzegorz Bizon2016-04-181-1/+2
| | | | |
| * | | | Add `variables` keyword to job in CI config YAMLGrzegorz Bizon2016-04-181-2/+10
| | | | |
* | | | | Merge branch 'edit-last-comment' into 'master' Dmitriy Zaporozhets2016-04-182-7/+38
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scroll to the last comment I made and edit it. Pressing up in an empty comment box will edit your last comment. Also now when you click edit on a comment it will put the cursor at the end. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15267 ![scrollup](/uploads/b056fdc479d39311f2be412458028a83/scrollup.gif) See merge request !3757
| * | | | Add move cursor to last character for editing comment also.edit-last-commentJacob Schatz2016-04-161-4/+9
| | | | |
| * | | | When editing put the cursor at the end of the textareaJacob Schatz2016-04-151-1/+5
| | | | |
| * | | | Scroll to the last comment I made and edit it.Jacob Schatz2016-04-152-7/+29
| | | | |
* | | | | Instrument Repository.clean_old_archivesYorick Peterse2016-04-181-3/+5
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into 14552-signup-password-leak14552-signup-password-leakTimothy Andrew2016-04-18113-528/+1046
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'fix-issue-dropzone' into 'master' Stan Hu2016-04-182-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with dropzone not working on new issuable Closes #15295 See merge request !3760
| | * | | | Fix issue with go full screen triggering attach filePhil Hughes2016-04-161-1/+1
| | | | | |
| | * | | | Fixed issue with dropzone not working on new issuablePhil Hughes2016-04-151-1/+1
| | |/ / / | | | | | | | | | | | | | | | Closes #15295
| * | | | Merge branch 'master' into number_sign_for_external_issue_refBaldinoF2016-04-17338-2450/+5182
| |\ \ \ \
| | * \ \ \ Merge branch 'issues-mobile-header' into 'master' Jacob Schatz2016-04-169-156/+149
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored issue header to work better for mobile This will also work better for when the title makes the buttons drop down a new line Closes #14228 See merge request !3487
| | | * | | | Updated some if statementsissues-mobile-headerPhil Hughes2016-04-162-43/+40
| | | | | | |
| | | * | | | Fixed testsPhil Hughes2016-04-162-5/+5
| | | | | | |
| | | * | | | Fixed up based on feedbackPhil Hughes2016-04-163-10/+8
| | | | | | |
| | | * | | | Alignment with sidebarPhil Hughes2016-04-161-1/+1
| | | | | | |
| | | * | | | Moved meta information into an issuable helper methodPhil Hughes2016-04-163-17/+14
| | | | | | |
| | | * | | | Merge request header markup now matches issue markup for consistancyPhil Hughes2016-04-162-34/+41
| | | | | | |
| | | * | | | Refactored issue header to work better for mobilePhil Hughes2016-04-166-111/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will also work better for when the title makes the buttons drop down a new line Closes #14228
| | * | | | | Merge branch 'fivehundred_on_ui_help' into 'master' Dmitriy Zaporozhets2016-04-162-6/+7
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a user available for the user variable Fixes: #15289 `current_user` is not available if one is signed out. Look for @dzaporozhets's user if available or just user with id `1`. Dz will work on GitLab.com and user with id 1 will work on dev. See merge request !3766