summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'fix/contributions-forked-projects' into 'master' Douwe Maan2016-03-011-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio...James Lopez2016-02-296-6/+73
| |\ \ \ | | | |/ | | |/|
| * | | include contributions from forked projects on profile calendarJames Lopez2016-02-221-1/+1
* | | | Merge branch 'issue_13648' into 'master' Dmitriy Zaporozhets2016-02-291-6/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Logged in user should be able to read internal forks.Rubén Dávila2016-02-271-1/+1
| * | | Improve implementation to check read access to forks and add pagination.Rubén Dávila2016-02-261-6/+16
| | |/ | |/|
* | | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-292-2/+60
|\ \ \
| * | | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-262-2/+60
| |/ /
* | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-241-0/+6
|\ \ \ | |/ /
| * | Merge branch 'issue_13301_emoji-menu' into 'master' Robert Speicher2016-02-241-0/+6
| |\ \
| | * | Update award_emoji testAnnabel Dunstone2016-02-231-1/+2
| | * | Create EmojisControllerAnnabel Dunstone2016-02-222-4/+5
| | * | Load award emoji picker with ajax requestAnnabel Dunstone2016-02-181-0/+4
* | | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2319-45/+198
|\ \ \ \ | |/ / /
| * | | Merge branch 'fix-todos' into 'master' Robert Speicher2016-02-231-1/+1
| |\ \ \
| | * | | Does not raise an error when Todo is already marked as doneDouglas Barbosa Alexandre2016-02-231-1/+1
| | | |/ | | |/|
| * | | Correctly checks if tree view is on screenPhil Hughes2016-02-231-1/+1
| * | | Fixes issue with file view rows not clickable on project main viewfiles-view-row-clickPhil Hughes2016-02-231-3/+3
| |/ /
| * | Use before_action instead of before_filterDouglas Barbosa Alexandre2016-02-211-1/+1
| * | Add "Mark all as done" buttonDouwe Maan2016-02-201-1/+15
| * | Fix rubucop offensesDouglas Barbosa Alexandre2016-02-201-2/+0
| * | Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-203-22/+24
| * | Create or mark task pending as soon the action happensDouglas Barbosa Alexandre2016-02-201-0/+2
| * | Add filters by project, author, type, and action to task queue page listDouglas Barbosa Alexandre2016-02-201-7/+1
| * | Fix rubocop offensesDouglas Barbosa Alexandre2016-02-201-5/+5
| * | Remove task abilities, since we will only ever show the user their ownDouglas Barbosa Alexandre2016-02-201-8/+0
| * | Add pending tasks badge on top right next to the new and logout buttonDouglas Barbosa Alexandre2016-02-201-3/+0
| * | Allow user to mark each task as done manuallyDouglas Barbosa Alexandre2016-02-201-0/+23