summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with enter key not selecting correct value in dropdowndropdown-enter-select-fixPhil Hughes2016-04-061-1/+1
|
* Merge branch '14942-last-commit-styling' into 'master' Jacob Schatz2016-04-062-2/+2
|\ | | | | | | | | | | | | | | | | | | Add CI styling to all CI updates Fixes #14942 Correct styling for last commit: ![Screen_Shot_2016-04-05_at_2.17.54_PM](/uploads/8cbda0023eaf7a26b776f3da58050e1a/Screen_Shot_2016-04-05_at_2.17.54_PM.png) See merge request !3554
| * Add CI styling to all CI updates14942-last-commit-stylingAnnabel Dunstone2016-04-052-2/+2
| |
* | Merge branch 'fix-project-path-rename' into 'master' Stan Hu2016-04-051-0/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-0/+3
| | | | | | | | Closes #14885
* | Merge branch 'close-issue-bug' into 'master' Jacob Schatz2016-04-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix data check in update issue response See merge request !3548
| * | 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-0518-258/+246
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 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-041-5/+9
| | | |
| * | | Tests updatePhil Hughes2016-04-041-1/+1
| | | |
| * | | 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
| | | |
* | | | Merge branch 'fix/permissions-when-importing-members' into 'master' Douwe Maan2016-04-051-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-1/+1
| | | | |
| * | | | Do not leak project exists when importing membersGrzegorz Bizon2016-04-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-2/+7
| | |_|/ | |/| | | | | | | | | | Closes #14899
* | | | Merge branch 'reorder-language' into 'master' Yorick Peterse2016-04-051-3/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Update language after doing all other operations See merge request !3533
| * | | Update language only on HEAD of the repositoryreorder-languageKamil Trzcinski2016-04-051-0/+3
| | | |
| * | | Update language after doing all other operationsKamil Trzcinski2016-04-051-3/+4
| | |/ | |/|
* | | Merge branch 'fix-gh-pr-import' into 'master' Yorick Peterse2016-04-052-0/+7
|\ \ \ | | | | | | | | | | | | | | | | Fix Importing repos from GHE doesn't work See merge request !3529
| * | | Flush repository cache before import project datafix-gh-pr-importDouglas Barbosa Alexandre2016-04-042-0/+7
| | | | | | | | | | | | | | | | | | | | GitHub Pull Requests importer handle with the repository while importing data, we need to make sure that the cached values are valid.
* | | | Wrap images in discussions and wikis with a link to the image source using ↵connorshea2016-04-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ImageLinkFilter. Resolves #14411. See merge request !3464
* | | | Merge branch 'remove-2fa-status' into 'master' Jacob Schatz2016-04-041-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 2FA status on enable page The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled. ### Before ![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png) ### After ![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png) See merge request !3436
| * | | | Remove 2FA status on enable pageremove-2fa-statusRobert Schilling2016-03-291-2/+0
| | | | |
* | | | | Merge branch 'admin-pages-layout' into 'master' Dmitriy Zaporozhets2016-04-043-35/+49
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI for admin/groups page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3523
| * | | | Single quotes paradiseadmin-pages-layoutDmitriy Zaporozhets2016-04-041-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve UI for admin/groups pageDmitriy Zaporozhets2016-04-043-35/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'dz-admin-area-fixes' into 'master' Jacob Schatz2016-04-045-9/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set of UI fixes for admin area See merge request !3525
| * | | | | Fix missing paddings in admin areaDmitriy Zaporozhets2016-04-044-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Dont use monospace font for namesDmitriy Zaporozhets2016-04-041-1/+1
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'hide_profile_activity_on_mobile' into 'master' Jacob Schatz2016-04-042-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide user profile activity graph on mobile closes #14507 ## Before ![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png) ## After ![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png) ## Medium width screen ![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif) See merge request !3412
| * | | | | hide user profile activity graph on mobile and enable horizontal scroll for ↵hide_profile_activity_on_mobileArinde Eniola2016-04-012-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | medium screens