summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'improve-archived-projects'Dmitriy Zaporozhets2016-03-094-24/+32
|\
| * Add projects list sort dropdown to group pageDmitriy Zaporozhets2016-03-041-2/+4
| * Add option to show archived projects on dahsboardDmitriy Zaporozhets2016-03-043-22/+28
* | Remove instance variable @group multiple assignmentYatish Mehta2016-03-081-1/+1
* | Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-072-0/+5
|\ \
| * | Refactor caching codeJacob Vosmaer2016-03-072-4/+5
| * | Tell clients/proxies to cache raw blob requestsJacob Vosmaer2016-03-032-0/+4
* | | Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-071-4/+0
|\ \ \
| * | | Updates from last code review.issue_13621_2Rubén Dávila2016-03-061-4/+0
* | | | Merge branch 'rs-no-default-credentials' into 'master' Douwe Maan2016-03-042-0/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Allow the initial admin to set a passwordrs-no-default-credentialsRobert Speicher2016-03-042-0/+26
| | |/ | |/|
* | | Merge branch 'fix/sentry-1182' into 'master' Douwe Maan2016-03-041-6/+2
|\ \ \ | |/ / |/| |
| * | In UsersController#calendar_activities, when Date isn't parsable, fallback to...fix/sentry-1182Rémy Coutable2016-03-031-6/+2
* | | Merge remote-tracking branch 'origin/sort-starred-projects'Dmitriy Zaporozhets2016-03-041-1/+1
|\ \ \
| * | | Revert "Revert "Sort starred projects on dashboard based on last activity by ...sort-starred-projectsDmitriy Zaporozhets2016-03-031-1/+1
| | |/ | |/|
* | | Invalidate cache for builds badgeGrzegorz Bizon2016-03-041-0/+13
* | | Don't abuse the flash store for displaying SSH Key form errorsRobert Speicher2016-03-031-2/+3
* | | Remove `Profile::KeysController#new` actionRobert Speicher2016-03-031-4/+0
* | | Fixed failing ssh key testsPhil Hughes2016-03-031-1/+1
* | | SSH keys settingsPhil Hughes2016-03-031-2/+3
* | | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-033-12/+13
|/ /
* | Revert "Sort starred projects on dashboard based on last activity by default"Dmitriy Zaporozhets2016-03-031-1/+1
* | Sort starred projects on dashboard based on last activity by defaultDmitriy Zaporozhets2016-03-031-1/+1
* | Merge branch 'refactor-projects-list' into 'master' Dmitriy Zaporozhets2016-03-031-0/+11
|\ \
| * | Refactor projects listDmitriy Zaporozhets2016-03-031-0/+11
| |/
* | Merge branch 'issue_13648' into 'master' Douwe Maan2016-03-031-8/+1
|\ \ | |/ |/|
| * Add specs to ForksController#index.issue_13648Rubén Dávila2016-03-021-6/+1
| * Reuse query from ProjectsFinder to get projects accessible to current user.Rubén Dávila2016-03-011-3/+1
* | Merge branch 'issue_4095' into 'master' Dmitriy Zaporozhets2016-03-032-2/+2
|\ \
| * | Don't list merge requests from archived projects in Group view.Rubén Dávila2016-03-021-1/+1
| * | Don't list issues from archived projects in Group view.Rubén Dávila2016-03-021-1/+1
* | | Merge branch 'improve-user-tabs' into 'master' Jacob Schatz2016-03-031-7/+53
|\ \ \
| * \ \ Merge branch 'master' into improve-user-tabsAlfredo Sumaran2016-03-015-24/+29
| |\ \ \ | | | |/ | | |/|
| * | | Make url and actions to be the same nameAlfredo Sumaran2016-03-011-2/+2
| * | | Respond with 'show' view. Tab content will be loaded dinamicallyAlfredo Sumaran2016-03-011-3/+3
| * | | Respond to .json requestsAlfredo Sumaran2016-02-291-3/+24
| * | | Add routes and actions for dynamic tab loadingJosh Frye2016-02-291-7/+32
* | | | Merge branch 'fix/13781-delete-tag-without-ajax' into 'master' Rémy Coutable2016-03-021-1/+6
|\ \ \ \
| * | | | Make the tags delete button remote in the tags listfix/13781-delete-tag-without-ajaxRémy Coutable2016-03-011-1/+6
| | |/ / | |/| |
* | | | Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into...Douwe Maan2016-03-021-2/+2
|\ \ \ \
| * | | | Don't show "Welcome to GitLab" when the search didn't return any projectsRémy Coutable2016-03-021-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'fix/deprecated-ci-badge-permissions' into 'master' Douwe Maan2016-03-021-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Do not require authentication for CI status badgefix/deprecated-ci-badge-permissionsGrzegorz Bizon2016-03-011-1/+0
| * | | Fix deprecated CI build status badge permissionsGrzegorz Bizon2016-03-011-0/+3
* | | | Merge branch 'logged-out-search' into 'master' Robert Speicher2016-03-011-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Enable search for logged-out usersDmitriy Zaporozhets2016-03-011-0/+2
* | | | Merge branch 'rs-improve-grace-period' into 'master' Douwe Maan2016-03-011-5/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-periodRobert Speicher2016-02-291-5/+7
| |/ /
* | | Merge branch 'safe-content-type' into 'master' Douwe Maan2016-03-012-12/+5
|\ \ \
| * | | Explain why we mangle blob content typessafe-content-typeJacob Vosmaer2016-02-242-12/+5
View Lorry Controller Status