summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only update main language if it is not already setupdate_main_lang_if_unsetDrew Blessing2016-04-063-10/+27
|
* Merge branch 'fix-project-path-rename' into 'master' Stan Hu2016-04-053-1/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 after renaming a project path Renaming the path of a project would result in an Error 500 due to `@repository` being memoized with the old path. An Error 500 would result: ``` Started GET "/testing2/test1" for 127.0.0.1 at 2016-04-04 12:42:30 +0000 Processing by ProjectsController#show as HTML Parameters: {"namespace_id"=>"testing2", "id"=>"test1"} Completed 200 OK in 637ms (Views: 194.2ms | ActiveRecord: 111.8ms) Started GET "/testing2/test1/edit" for 127.0.0.1 at 2016-04-04 12:42:33 +0000 Processing by ProjectsController#edit as HTML Parameters: {"namespace_id"=>"testing2", "id"=>"test1"} Completed 200 OK in 594ms (Views: 183.8ms | ActiveRecord: 87.4ms) Started PATCH "/testing2/test1" for 127.0.0.1 at 2016-04-04 12:42:41 +0000 Processing by ProjectsController#update as HTML Parameters: {"utf8"=>"✓", "authenticity_token"=>"[FILTERED]", "project"=>{"nam e"=>"test123", "path"=>"test123"}, "namespace_id"=>"testing2", "id"=>"test1"} Completed 500 Internal Server Error in 1852ms (ActiveRecord: 124.0ms) ActionView::Template::Error (no repository for such path): 2: %legend 3: Builds: 4: 5: - unless @repository.gitlab_ci_yml 6: .form-group 7: .col-sm-offset-2.col-sm-10 8: %p Builds need to be configured before you can begin using Contin uous Integration. app/models/repository.rb:59:in `block in empty?' lib/repository_cache.rb:19:in `fetch' app/models/repository.rb:59:in `empty?' app/models/repository.rb:471:in `gitlab_ci_yml' app/views/projects/_builds_settings.html.haml:5:in `_app_views_projects__build s_settings_html_haml__782034335636359229_73397600' app/views/projects/edit.html.haml:87:in `block in _app_views_projects_edit_htm l_haml___2388082585934859365_47390860' app/views/projects/edit.html.haml:8:in `_app_views_projects_edit_html_haml___2 388082585934859365_47390860' app/controllers/projects_controller.rb:54:in `block (2 levels) in update' app/controllers/projects_controller.rb:43:in `update' lib/gitlab/middleware/go.rb:16:in `call' ``` Closes #14885 See merge request !3528
| * Fix Error 500 after renaming a project pathStan Hu2016-04-053-1/+27
| | | | | | | | Closes #14885
* | Merge branch 'rs-fix-gmail-actions' into 'master' Robert Speicher2016-04-052-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Premailer shouldn't remove script tags from our emails Closes #14943. See merge request !3552
| * | Premailer shouldn't remove script tags from our emailsRobert Speicher2016-04-052-1/+4
| | | | | | | | | | | | Closes #14943.
* | | Update CHANGELOG for 8.3.5 and 8.3.6Robert Speicher2016-04-051-0/+6
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'close-issue-bug' into 'master' Jacob Schatz2016-04-052-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix data check in update issue response See merge request !3548
| * | Update issue_spec testclose-issue-bugAnnabel Dunstone2016-04-051-3/+3
| | |
| * | Fix data check in update issue responseAnnabel Dunstone2016-04-051-1/+1
| | |
* | | Merge branch 'dropdown-arrow-support' into 'master' Jacob Schatz2016-04-051-18/+92
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown arrow support When the dropdown is open, you can scroll through the list of items with the up & down arrow keys. When an item is focused, the enter triggers the click event for that row. Closes #14455 See merge request !3385
| * | | CS multilinedropdown-arrow-supportPhil Hughes2016-04-051-5/+5
| | | |
| * | | Fixed issue based on feedbackPhil Hughes2016-03-311-21/+26
| | | |
| * | | Moved back some css classesPhil Hughes2016-03-312-12/+5
| | | |
| * | | Enter triggers the currently highlighted element clickPhil Hughes2016-03-311-12/+13
| | | |
| * | | Correctly scrolls the dropdown up & down with arrow keysPhil Hughes2016-03-311-4/+11
| | | |
| * | | Scrolls the dropdown content downPhil Hughes2016-03-311-2/+14
| | | |
| * | | Started arrow key movement on dropdownsPhil Hughes2016-03-312-6/+62
| | | |
* | | | Merge branch 'note-form-design' into 'master' Jacob Schatz2016-04-0523-266/+254
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Notes form design update Part of #3401 See merge request !3442
| * | | Removed emoji button from notes formnote-form-designPhil Hughes2016-04-051-3/+0
| | | |
| * | | SCSS colors into variablesPhil Hughes2016-04-045-26/+31
| | | |
| * | | Removed console.log from notesPhil Hughes2016-04-041-3/+0
| | | |
| * | | Updated testsPhil Hughes2016-04-043-7/+11
| | | |
| * | | Commits comment test updatePhil Hughes2016-04-041-1/+1
| | | |
| * | | Tests updatePhil Hughes2016-04-045-6/+6
| | | |
| * | | Reduced focus shadowPhil Hughes2016-04-041-1/+2
| | | |
| * | | Logged out boxPhil Hughes2016-04-044-49/+28
| | | |
| * | | Discussion formPhil Hughes2016-04-043-17/+27
| | | |
| * | | Removed css code that isnt usedPhil Hughes2016-04-043-39/+0
| | | |
| * | | Focus style for comment formPhil Hughes2016-04-044-14/+33
| | | |
| * | | Hides current user icon on mobilePhil Hughes2016-04-042-2/+8
| | | |
| * | | Added toolbar to comment formPhil Hughes2016-04-049-108/+129
| | | |
| * | | Restyling on elements in comment formPhil Hughes2016-04-0411-76/+76
| | | |
| * | | Started refactoring of note formPhil Hughes2016-04-046-39/+27
| | | |
* | | | The Markdown doc is one place where trailing whitespace mattersRobert Speicher2016-04-051-4/+4
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'markdown-attribution' into 'master' Sytse Sijbrandij2016-04-051-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attribution where it is due. Inspired by https://news.ycombinator.com/item?id=11431969 See merge request !3546
| * | | | Attribution where it is due.markdown-attributionSytse Sijbrandij2016-04-051-7/+7
| | | | |
* | | | | Merge branch 'upgrade-bundler-audit' into 'master' Robert Speicher2016-04-052-3/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade bundler-audit from 0.4.0 to 0.5.0 Bundler Audit can now run the `check` command with an `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI ([source](https://github.com/rubysec/bundler-audit#synopsis)). See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2015-02-28 See merge request !3433
| * | | | Upgrade bundler-audit from 0.4.0 to 0.5.0connorshea2016-03-282-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bundler Audit can now run check with the `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI. See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2 015-02-28
* | | | | Merge branch 'fix/permissions-when-importing-members' into 'master' Douwe Maan2016-04-053-3/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check permissions when importing project members Closes #14899 See merge request !3535
| * | | | | Respond 404 when unauthorized user imports membersfix/permissions-when-importing-membersGrzegorz Bizon2016-04-052-3/+3
| | | | | |
| * | | | | Do not leak project exists when importing membersGrzegorz Bizon2016-04-052-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing members, and user does not have permissions to read members in a source project, do not leak information about source project existence. Notifiy user that project has not been found instead.
| * | | | | Check permissions when importing project membersGrzegorz Bizon2016-04-053-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | Closes #14899
* | | | | | Add 8.4.6 and 8.4.7 CHANGELOG itemsRémy Coutable2016-04-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Add 8.5.9 CHANGELOG itemRémy Coutable2016-04-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'doc_ldap_fixes' into 'master' Achilleas Pipinellis2016-04-052-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix LDAP link and codeblock indentation See merge request !3538
| * | | | | | Fix LDAP link and codeblock indentationdoc_ldap_fixesAchilleas Pipinellis2016-04-052-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'reorder-language' into 'master' Yorick Peterse2016-04-052-7/+21
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Update language after doing all other operations See merge request !3533
| * | | | | Update language only on HEAD of the repositoryreorder-languageKamil Trzcinski2016-04-052-4/+17
| | | | | |
| * | | | | Update language after doing all other operationsKamil Trzcinski2016-04-051-3/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'build-notification-changelog' into 'master' Jacob Schatz2016-04-051-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CHANGELOG for build notifications [ci skip] See merge request !3537