summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rename License entity to RepoLicense to avoid conflict with EElicense-templates-and-api-12804Rémy Coutable2016-04-192-3/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix specsRémy Coutable2016-04-184-19/+9
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update to licensee 8.0.0 and fix API specsRémy Coutable2016-04-184-12/+13
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix features specs (hopefully)Rémy Coutable2016-04-182-4/+4
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Continue implementation of the license template selector and /licenses API ↵Rémy Coutable2016-04-1822-207/+588
| | | | | | endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
* Initial implementation if license template selector and /licenses/:key API ↵Anton Davydov2016-04-1812-3/+156
| | | | endpoint
* 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 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
* | | | Merge branch 'number_sign_for_external_issue_ref' into 'master' Douwe Maan2016-04-173-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add number sign on external issue reference text Currently, external issue link is `<a ...>123</a>`. After it will be: `<a ...>#123</a>`. See merge request !3350
| * | | | Add CHANGELOG entryBaldinoF2016-04-171-0/+1
| | | | |
| * | | | Merge branch 'master' into number_sign_for_external_issue_refBaldinoF2016-04-17708-5086/+29281
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'issues-mobile-header' into 'master' Jacob Schatz2016-04-1612-163/+158
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| * | | | | Added CHANGELOG itemPhil Hughes2016-04-161-0/+4
| | | | | |
| * | | | | Fixed up based on feedbackPhil Hughes2016-04-164-11/+9
| | | | | |
| * | | | | Alignment with sidebarPhil Hughes2016-04-161-1/+1
| | | | | |
| * | | | | Fixed testsPhil Hughes2016-04-162-7/+5
| | | | | |
| * | | | | 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
| | | | | |
View Lorry Controller Status