summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix project testrefactor-project-pageDmitriy Zaporozhets2015-05-051-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Restlye project sidebar a bit to make it more clearDmitriy Zaporozhets2015-05-052-11/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix project description and avatar alignmentDmitriy Zaporozhets2015-05-054-70/+25
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add changelog itemDmitriy Zaporozhets2015-05-051-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix right margin for project descriptionDmitriy Zaporozhets2015-05-051-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove project dropdown and fix db sche,aDmitriy Zaporozhets2015-05-052-31/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Show CI link on project home page only if CI enabledDmitriy Zaporozhets2015-05-051-8/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Reorganize elements in project sidebarDmitriy Zaporozhets2015-05-055-47/+56
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move clone panel to sidebarDmitriy Zaporozhets2015-05-054-9/+12
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove unnecessary info from project home pageDmitriy Zaporozhets2015-05-051-11/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Turn sidebar in sections with contribute and repositoryDmitriy Zaporozhets2015-05-053-37/+39
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move tabs with activity/readme to sectionDmitriy Zaporozhets2015-05-052-56/+55
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move project section to own partialDmitriy Zaporozhets2015-05-052-14/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move project sidebar to separate partialDmitriy Zaporozhets2015-05-052-53/+55
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-045-0/+34
|\
| * Merge branch 'fix-wiki-search' into 'master'Dmitriy Zaporozhets2015-05-045-0/+34
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when searching Wiki pages If a Wiki page turns up a hit in the search results, an error will occur: ``` Completed 500 Internal Server Error in 836ms NoMethodError - undefined method `slug' for "test.markdown":String: app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path' app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700' actionview (4.1.9) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.9) lib/action_view/template.rb:339:in `instrument' actionview (4.1.9) lib/action_view/template.rb:143:in `render' ``` An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case. Closes #1547 See merge request !592
| | * Fix Error 500 when searching Wiki pagesStan Hu2015-04-305-0/+34
| | | | | | | | | | | | Closes #1547
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-043-3/+6
|\ \ \
| * \ \ Merge pull request #9097 from sselberg/add-current_sign_in_at-to-rest-apiDmitriy Zaporozhets2015-05-043-3/+6
| |\ \ \ | | |/ / | |/| | Add current_sign_in_at to api User
| | * | Add current_sign_in_at to api UserSven Selberg2015-05-043-3/+6
| | | |
* | | | Merge branch 'Add_doc_block_new_users_by_default' into 'master'Job van der Voort2015-05-041-0/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added " How to maintain tight control over the number of active users..." Added " How to maintain tight control over the number of active users on your GitLab installation" to documentation. Please check that documentation is OK before accepting Merge. I took if from https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example#L149 cc/ @sytse See merge request !1792
| * | | update doc by removing unnecessary partsJob van der Voort2015-05-041-29/+3
| | | |
| * | | Added " How to maintain tight control over the number of active users on ↵Karen Carias2015-04-241-0/+35
| | | | | | | | | | | | | | | | your GitLab installation" to documentation
* | | | Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-043-2/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unescape branch names in compare commit The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash. Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here). * Closes #1399 * Closes https://github.com/gitlabhq/gitlabhq/issues/9105 See merge request !582
| * | | | Unescape branch names in compare commitStan Hu2015-04-303-2/+28
| | |_|/ | |/| | | | | | | | | | | | | | Closes #1399 Closes https://github.com/gitlabhq/gitlabhq/issues/9105
* | | | Merge branch 'annotate-models-update' into 'master'Robert Speicher2015-05-0339-26/+118
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Re-annotate models Re-ran `annotate` to fix model annotations. See merge request !603
| * | | Re-annotate modelsStan Hu2015-05-0339-26/+118
|/ / /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2015-05-031-1/+1
|\ \ \
| * \ \ Merge pull request #9237 from bbodenmiller/patch-1Robert Schilling2015-05-031-1/+1
| |\ \ \ | | | | | | | | | | add missing word to changelog
| | * | | add missing word to changelogBen Bodenmiller2015-05-031-1/+1
| | | | |
* | | | | Merge branch 'fix-config-yml-example' into 'master'Achilleas Pipinellis2015-05-031-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix config template from parse errors 62aa05dd0cc5b6e added comments that were not commented out. CI test builds do a `cp gitlab.yml.example gitlab.yml` and thus were failing. See merge request !602
| * | | | | Fix config template from parse errorsStan Hu2015-05-031-3/+3
|/ / / / /
* | | | | Merge branch 'fix/log-path' into 'master'Achilleas Pipinellis2015-05-031-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file paths for installations from the source See merge request !583
| * | | | | Fix file paths for installations from the sourceMarcos SF Filho2015-04-271-8/+8
| | | | | |
* | | | | | Merge branch 'fix_snippet_api_doc' into 'master'Achilleas Pipinellis2015-05-031-0/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add snippet visibilty as parameter to API doc, closes #1562 ## Description Snippet visibility level was added to API but was not to its documentation. Related to following commit: 928fc94c3d900069902b097d6464acee712a886c @axil Can you review? See merge request !601
| * | | | | Add snippet visibilty as parameter to API doc, closes #1562Robert Schilling2015-05-031-0/+15
| | | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling2015-05-032-1/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'changelog-remove-dup' into 'master'Achilleas Pipinellis2015-05-031-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate CHANGELOG line for v7.10.0 The other one is 3 lines below the removed. [ci skip] See merge request !563
| | * | | | | | Remove duplicate CHANGELOG line for v7.10.0Aurelio Jargas2015-04-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The other one is 3 lines below the removed.
| * | | | | | | Merge branch 'master' into 'master'Achilleas Pipinellis2015-05-031-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update config.yml.example See merge request !597
| | * | | | | | | Update config.yml.examplewin322015-05-021-1/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2015-05-0336-108/+353
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into ↵Dmitriy Zaporozhets2015-05-0310-6/+49
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jubianchi-api-iid
| | * | | | | | | | Query issues, merge requests and milestones with their IID through APIjubianchi2015-05-0210-6/+49
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #9066 from jirutka/fix-6417Dmitriy Zaporozhets2015-05-034-12/+14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix #6417: users with group permission should be able to create groups via API
| | * | | | | | | | Fix #6417: users with group permission should be able to create groups via APIRobert Schilling2015-03-314-12/+14
| | | | | | | | | |
| * | | | | | | | | Merge pull request #9234 from dsander/group-milestones-by-titleDmitriy Zaporozhets2015-05-037-33/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Group milestones by title in the dashboard and all other issue views
| | * | | | | | | | | Group milestones by title in the dashboard and all other issue viewsDominik Sander2015-05-016-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This groups milestones by title for issue views like it has been done for the milestone dashboard/project overview. Before milestones with the same title would show up multiple times in the filter dropdown and one could only filter per project and milestone. Now the milestone filter is based on the title of the milestone, i.e. all issues marked with the same milestone title are shown.
| | * | | | | | | | | Removed unused ApplicationController#set_filter_values methodDominik Sander2015-05-011-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The instance variables assigned in `set_filter_values` are not used by anything anymore.
| * | | | | | | | | | Merge pull request #8756 from zaburt/force_utf8_on_oauth_propertiesDmitriy Zaporozhets2015-05-034-35/+100
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add common method to force utf8 and force oauth properties to be utf8