summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Resolve mergeafter-scriptKamil Trzcinski2016-04-181-15/+0
|
* Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-1827-114/+363
|\
| * 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-183-13/+34
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print style [test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf) Closes #14201 See merge request !3784
| | * | | CHANGELOG itemprint-stylePhil Hughes2016-04-181-0/+1
| | | | |
| | * | | 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-188-35/+168
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Minor refactorings in CI configfeature/ci-job-env-variablesGrzegorz Bizon2016-04-182-7/+10
| | | | | |
| | * | | | Add minor fixes in docs for job-specific variablesGrzegorz Bizon2016-04-182-11/+7
| | | | | |
| | * | | | Validate job-level variables in YAML config fileGrzegorz Bizon2016-04-182-13/+40
| | | | | |
| | * | | | Update documentation on job level build variablesGrzegorz Bizon2016-04-181-4/+6
| | | | | |
| | * | | | Improve grammar in CI documentation for build varsGrzegorz Bizon2016-04-181-4/+7
| | | | | |
| | * | | | Add documentation for job-level build variablesGrzegorz Bizon2016-04-182-1/+24
| | | | | |
| | * | | | Minor refactoring in code related to job variablesGrzegorz Bizon2016-04-182-24/+25
| | | | | |
| | * | | | Remove code that removes duplicate CI variablesGrzegorz Bizon2016-04-182-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point this is being handled by GitLab Runner and we need to introduce this as a separate merge request.
| | * | | | Add Changelog entry for job-level variablesGrzegorz Bizon2016-04-181-0/+1
| | | | | |
| | * | | | Improve build specs for job environment variablesGrzegorz Bizon2016-04-181-2/+5
| | | | | |
| | * | | | Make CI config return empty array if no job variablesGrzegorz Bizon2016-04-182-2/+17
| | | | | |
| | * | | | Rename method that returns global envs in CI confGrzegorz Bizon2016-04-183-3/+3
| | | | | |
| | * | | | Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-185-25/+38
| | | | | |
| | * | | | Make it possible to override build variablesGrzegorz Bizon2016-04-183-7/+22
| | | | | |
| | * | | | Add `variables` keyword to job in CI config YAMLGrzegorz Bizon2016-04-184-15/+60
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-1832-246/+597
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | | | | |
| * | | | | Merge branch 'instrument-repository-archive-worker' into 'master' Rémy Coutable2016-04-183-4/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument Repository.clean_old_archives This is done so we have some metrics for https://gitlab.com/gitlab-org/gitlab-ce/issues/15256. See merge request !3742
| | * | | | | Instrument Repository.clean_old_archivesYorick Peterse2016-04-183-4/+30
| |/ / / / /
| * | | | | Merge branch 'fix-method-instrumentation' into 'master' Rémy Coutable2016-04-183-24/+65
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Module#prepend for method instrumentation cc @pcarranza See merge request !3754
| | * | | | | Use Module#prepend for method instrumentationfix-method-instrumentationYorick Peterse2016-04-183-24/+65
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using Module#prepend we can define a Module containing all proxy methods. This removes the need for setting up crazy method alias chains and in turn prevents us from having to deal with all that madness (e.g. methods calling each other recursively). Fixes gitlab-org/gitlab-ce#15281
| * | | | | Merge branch '14552-signup-password-leak' into 'master' Rémy Coutable2016-04-183-5/+60
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't populate the password field on signup validation errors - Previously, we were pulling `params[:user][:password]` as the default value for the password field. This is incorrect; we should be pulling it from `@user.password` or the like. [Closes #14552] See merge request !3691
| | * | | | Move CHANGELOG entry to a random place.Timothy Andrew2016-04-181-1/+1
| | | | | |
| | * | | | Add acceptance test to check if the user password persists after form ↵Timothy Andrew2016-04-181-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redisplays. - While signing up.
| | * | | | Merge remote-tracking branch 'origin/master' into 14552-signup-password-leak14552-signup-password-leakTimothy Andrew2016-04-18234-1012/+3985
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'fix-issue-dropzone' into 'master' Stan Hu2016-04-183-2/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with dropzone not working on new issuable Closes #15295 See merge request !3760
| | * | | | | Added upload file test to new issue formfix-issue-dropzonePhil Hughes2016-04-171-0/+38
| | | | | | |
| | * | | | | 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
View Lorry Controller Status