summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix admin user projects lists.admin-user-projectsDouwe Maan2015-03-313-5/+7
|
* Merge branch 'emailsonpush-create-delete' into 'master'Dmitriy Zaporozhets2015-03-235-132/+184
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send EmailsOnPush email when branch or tag is created or deleted. Addresses #1951, #1957 and #1925. ![Screen_Shot_2015-03-17_at_13.58.15](https://dev.gitlab.org/gitlab/gitlabhq/uploads/16ff25adb4b4a7e1923612e0652442b4/Screen_Shot_2015-03-17_at_13.58.15.png) ![Screen_Shot_2015-03-17_at_13.58.22](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e346c1d84aba3a093b722d0a4167e289/Screen_Shot_2015-03-17_at_13.58.22.png) ![Screen_Shot_2015-03-17_at_13.58.28](https://dev.gitlab.org/gitlab/gitlabhq/uploads/720437ecc13f317c6d20eff82ac60bd7/Screen_Shot_2015-03-17_at_13.58.28.png) ![Screen_Shot_2015-03-17_at_13.58.34](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2b302bb6cdbe27c96a8dff1375236602/Screen_Shot_2015-03-17_at_13.58.34.png) See merge request !1709
| * Clean up code by using keyword arguments.Douwe Maan2015-03-233-10/+22
| |
| * Send EmailsOnPush email when branch or tag is created or deleted.Douwe Maan2015-03-185-125/+165
| |
* | Merge branch 'no-comment-bubble' into 'master'Dmitriy Zaporozhets2015-03-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Don't show commit comment button when user is not signed in. Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167. See merge request !429
| * | Don't show commit comment button when user is not signed in.Douwe Maan2015-03-231-1/+1
| | |
* | | Merge branch 'userpage-activity-scroll'Dmitriy Zaporozhets2015-03-233-7/+22
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: app/controllers/users_controller.rb
| * | | Fix atom feed for user pageuserpage-activity-scrollDmitriy Zaporozhets2015-03-221-1/+6
| | | |
| * | | Add inifinite scroll to user activity on user pageDmitriy Zaporozhets2015-03-223-6/+16
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-2312-150/+69
|\ \ \ \
| * \ \ \ Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets2015-03-2310-149/+53
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace commits calendar with contributions calendar * count opening of issues and merge requests * dont trigger git repository - use events from database * count pushes instead of commits for faster and easier counting * much-much faster since does not affected by repository size See merge request !420
| | * | | | Improve contribution calendar per day infoDmitriy Zaporozhets2015-03-223-28/+3
| | | | | |
| | * | | | Contribution calendar will use events instead of commits to count contributionsDmitriy Zaporozhets2015-03-221-1/+4
| | | | | |
| | * | | | Refactor contributions events and write tests for calendarDmitriy Zaporozhets2015-03-224-12/+13
| | | | | |
| | * | | | Replace commits calendar with contributions calendarDmitriy Zaporozhets2015-03-216-114/+39
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * count opening of issues and merge requests * dont trigger git repository - use events from database * much-much faster since does not affected by repository size
| * | | | Merge branch 'fix-admin-service-template-config' into 'master'Douwe Maan2015-03-232-1/+16
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include missing events and fix save functionality in admin service template settings form ### What does this MR do? This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings. ### Are there points in the code the reviewer needs to double check? No. ### Why was this MR needed? Because the service template form was broken and untested. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1275 Before: ![Screen_Shot_2015-03-23_at_5.53.19_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/e1bff75f30a3b6ecb174d3e25c722b7e/Screen_Shot_2015-03-23_at_5.53.19_AM.png) After: ![Screen_Shot_2015-03-23_at_5.53.13_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/8fada00128a3d0951b3230fefa64be92/Screen_Shot_2015-03-23_at_5.53.13_AM.png) See merge request !427
| | * | | Include missing events and fix save functionality in admin service template ↵Stan Hu2015-03-232-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings form Closes #1275
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-232-10/+16
|\ \ \ \ \
| * | | | | Fix #8966 Remove Milestones/Labels from project navbar when Isses disabledvichak2015-03-232-2/+6
| | | | | |
| * | | | | Fix #8966 Remove Milestones ans Labels from project navbar when Issues disabledvichak2015-03-231-10/+12
| |/ / / /
* | | | | Merge branch 'your' into 'master'Dmitriy Zaporozhets2015-03-2314-19/+17
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update views to single form of address. Change "my" to "your" Part of user experience. Every software (twitter, facebook etc) talks to you like "change your password" but not "change my password". cc @sytse @job See merge request !1736
| * | | | Update views to single form of address. Change "my" to "your"Dmitriy Zaporozhets2015-03-2214-19/+17
| |/ / /
* | | | Make panel heading font boldDmitriy Zaporozhets2015-03-221-0/+2
|/ / /
* | | Merge branch 'fix-dots-in-wiki-title' into 'master'Dmitriy Zaporozhets2015-03-222-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dots in Wiki slug causing errors ### What does this MR do? When a user enters in dots into the Wiki slug, an error occurs: ``` NoMethodError (undefined method `escaped_url_path' for nil:NilClass): app/models/wiki_page.rb:172:in `set_attributes' app/models/wiki_page.rb:191:in `save' app/models/wiki_page.rb:155:in `update' app/controllers/projects/wikis_controller.rb:49:in `update' ``` This MR fixes this problem. ### Are there points in the code the reviewer needs to double check? See the problem below. ### Why was this MR needed? The issue is that the `save` method gets called differently: ```ruby def create(attr = {}) .... save :create_page, title, content, format, message ``` or ```ruby def update(new_content = "", format = :markdown, message = nil) ... save :update_page, @page, content, format, message ``` In the create case, title is the slug entered in by the user (e.g. `path/how-to-write-wiki-pages`). In the update case, originally `@page.page` included the format extension (e.g.`path/how-to-write-wiki-pages.Markdown`). The method `page_title_and_dir` was trying to handle both cases and not doing the right thing. For example, calling `page_title_and_dir('test-1.2.3')` would result in: ``` path_title = test-1.2 path_dir = 3 ``` ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? Issues #1263, #431 This replaces !156 See merge request !419
| * | | Fix dots in Wiki slug causing errorsStan Hu2015-03-212-2/+3
| | | | | | | | | | | | | | | | Closes #1263, #431
* | | | Merge branch 'fix-import-from-modal' into 'master'Dmitriy Zaporozhets2015-03-221-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Import projects from" button to show the correct instructions Closes #1267 See merge request !422
| * | | | Fix "Import projects from" button to show the correct instructionsStan Hu2015-03-221-3/+3
| | |/ / | |/| | | | | | | | | | Closes #1267
* | | | Remove old GitLab auth imageRobert Schilling2015-03-221-0/+0
|/ / /
* | | Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-219-53/+52
| | |
* | | Remove 32px oauth imagesDmitriy Zaporozhets2015-03-217-0/+0
|/ /
* | Merge branch 'topic/push_tag_events_for_ci' of ↵Dmitriy Zaporozhets2015-03-213-34/+47
|\ \ | | | | | | | | | https://github.com/ayufan/gitlabhq into ayufan-topic/push_tag_events_for_ci
| * | Extend push_tag event to include tag message and last commitKamil Trzcinski2015-03-213-34/+47
| | |
* | | Merge branch 'performance-tune' into 'master'Dmitriy Zaporozhets2015-03-211-3/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance improvements * Cache project branches and tags into variables * Cache lookup results into hash to prevent repeating same requests to git repo * Cache head commit and head tree See merge request !417
| * | | Cache head commit and head treeDmitriy Zaporozhets2015-03-211-2/+10
| | | |
| * | | Cache lookup results into hash to prevent repeating same requests to git repoDmitriy Zaporozhets2015-03-211-1/+10
| | | |
| * | | Cache project branches and tags into variablesDmitriy Zaporozhets2015-03-211-0/+16
| |/ /
* | | Hide UI elements when print md files or wiki pagesfix-print-cssDmitriy Zaporozhets2015-03-211-0/+4
|/ /
* | Merge branch 'improve-avatar-header' into 'master'Dmitriy Zaporozhets2015-03-215-30/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | Improve header with avatar for group and user pages Nice looking and aligned headers for user and group pages See merge request !412
| * | Improve header with avatar for group and user pagesDmitriy Zaporozhets2015-03-205-30/+45
| | |
* | | Prevent diff header overflowDmitriy Zaporozhets2015-03-201-1/+3
|/ /
* | Merge branch 'user-location' into 'master'Dmitriy Zaporozhets2015-03-213-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Location field in user profile Twitter allows you to set string with location information. I find it very useful in work to know where user from. It allows to communicate with knowing time difference and cultural things. See merge request !411
| * | Add location to user pageDmitriy Zaporozhets2015-03-201-0/+4
| | |
| * | Add location to user profileDmitriy Zaporozhets2015-03-202-1/+4
| | |
* | | Merge branch 'link_to_ci_with_ref' into 'master'Dmitriy Zaporozhets2015-03-207-21/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to CI with ref gitlab/gitlab-ci#162 !!! Should be merged simultaneously with https://dev.gitlab.org/gitlab/gitlab-ci/merge_requests/129 See merge request !1638
| * | | Link to CI with refValery Sizov2015-03-207-21/+21
| | | |
* | | | Fix votes inline renderingDmitriy Zaporozhets2015-03-201-2/+2
| | | |
* | | | Improve issue sidebar positionDmitriy Zaporozhets2015-03-202-2/+2
| | | |
* | | | Merge branch 'upvotes-refactoring' into 'master'Dmitriy Zaporozhets2015-03-206-57/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make issue and merge request sidebar more compact * move votes block to participants * make smaller font in sidebar * remove js for upvoting since it differs from logic on backend and does not work correctly Fixes #1253 Tested on different screens: HD, 1366x768, 1024x600 See merge request !410
| * | | | Make issue and merge request sidebar more compactupvotes-refactoringDmitriy Zaporozhets2015-03-206-57/+26
| | | | | | | | | | | | | | | | | | | | | | | | | * move votes block to participants * make smaller font in sidebar
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-201-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |