summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add "Manage merge requests" permission to docsRobert Speicher2015-07-241-0/+1
* Add admin_merge_request ability to Developer level and upRobert Speicher2015-07-241-1/+2
* Merge branch 'auth-icons-labels' into 'master' Valery Sizov2015-07-2426-108/+140
|\
| * Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-2326-107/+139
* | Merge branch 'rs-changes-suppressed-link' into 'master' Douwe Maan2015-07-244-5/+18
|\ \
| * | Fix and style the "Changes suppressed" link.rs-changes-suppressed-linkRobert Speicher2015-07-234-5/+18
* | | Merge branch 'rs-issue-2012' into 'master' Douwe Maan2015-07-243-10/+41
|\ \ \ | |/ / |/| |
| * | Add User.find_by_username!rs-issue-2012Robert Speicher2015-07-233-1/+17
| * | Make username parameter for Users#show case-insensitiveRobert Speicher2015-07-182-11/+26
* | | Merge branch 'update_changelog1' into 'master' Valery Sizov2015-07-231-6/+11
|\ \ \
| * | | update changelogValery Sizov2015-07-231-3/+2
| * | | update changelog1Valery Sizov2015-07-231-3/+9
|/ / /
* | | Clarify some things in monthly.mdSytse Sijbrandij2015-07-231-5/+5
* | | Merge branch 'changes_for_gmail_inbox_actions' into 'master' Douwe Maan2015-07-234-102/+1
|\ \ \ | |_|/ |/| |
| * | Remove docs and rake task for gmail actions to prevent problems with registra...changes_for_gmail_inbox_actionsMarin Jankovski2015-07-223-101/+0
| * | Use mdash to prevent breaking html emails.Marin Jankovski2015-07-221-1/+1
* | | Merge branch 'remove-source-branch' into 'master' Valery Sizov2015-07-235-3/+16
|\ \ \
| * | | Return true/false from AutoMergeService#merge!remove-source-branchDouwe Maan2015-07-231-0/+4
| * | | Fix Remove source-branch for MRs from same projectDouwe Maan2015-07-225-3/+12
* | | | Merge branch 'revert_even_cache' into 'master' Valery Sizov2015-07-232-8/+8
|\ \ \ \
| * | | | revert cache for eventsrevert_even_cacheValery Sizov2015-07-232-8/+8
|/ / / /
* | | | Merge branch 'label_caching' into 'master' Valery Sizov2015-07-232-37/+39
|\ \ \ \
| * | | | revert cache issuelabel_cachingValery Sizov2015-07-222-37/+39
| |/ / /
* | | | Merge branch 'fix-link-to-2fa' into 'master'Robert Speicher2015-07-221-1/+1
|\ \ \ \
| * | | | Fix link to 2fa help page. Closes #2055Achilleas Pipinellis2015-07-221-1/+1
| |/ / /
* | | | Merge branch 'migrate_session_expire_delay_unless_it_exists' into 'master' Robert Speicher2015-07-221-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Check if session_expire_delay column exists before adding the column.migrate_session_expire_delay_unless_it_existsMarin Jankovski2015-07-221-2/+4
| |/ /
* | | Merge branch 'revert_note_caching' into 'master'Valery Sizov2015-07-221-4/+3
|\ \ \
| * | | revert caching of note textHannes Rosenögger2015-07-211-4/+3
* | | | Merge branch 'rs-security-spec-speed' into 'master' Douwe Maan2015-07-2215-425/+371
|\ \ \ \ | |_|/ / |/| | |
| * | | Move spec/features/admin/security_spec to spec/features/securityrs-security-spec-speedRobert Speicher2015-07-221-0/+2
| * | | Consolidate group access specs into one fileRobert Speicher2015-07-225-353/+284
| * | | Move custom matchers to their own files under spec/support/matchersRobert Speicher2015-07-222-10/+9
| * | | Remove redundant Profile access test casesRobert Speicher2015-07-221-9/+0
| * | | Remove be_not_found_for matcherRobert Speicher2015-07-221-5/+0
| * | | Move access-related matchers to their own moduleRobert Speicher2015-07-2211-35/+72
| * | | Remove unused `be_valid_commit` matcherRobert Speicher2015-07-211-9/+0
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-07-228-12/+86
|\ \ \ \
| * \ \ \ Merge branch 'fix-cache-clear-test-issue' into 'master'Stan Hu2015-07-221-6/+2
| |\ \ \ \
| | * | | | Clearing the entire Redis cache may be too expensive; just useStan Hu2015-07-211-6/+2
| |/ / / /
| * | | | Merge branch 'fix-dup-changelog-entry' into 'master'Stan Hu2015-07-221-2/+1
| |\ \ \ \
| | * | | | Remove 7.14 entry that was pushed to 7.13Stan Hu2015-07-211-2/+1
| |/ / / /
| * | | | Merge branch 'fix-404-empty-repo' into 'master'Stan Hu2015-07-225-8/+47
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix 404 error in files view after deleting the last file in a repositoryStan Hu2015-07-215-8/+46
| * | | | Merge branch 'fix-snippet-note-fullscreen' into 'master'Hannes Rosenögger2015-07-212-1/+5
| |\ \ \ \
| | * | | | Fix full screen mode for snippet commentsDaniel Gerhardt2015-07-212-1/+5
| |/ / / /
| * | | | Merge branch 'document-2fa-backup' into 'master' Valery Sizov2015-07-212-2/+38
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | You need to store your DB encryption keydocument-2fa-backupJacob Vosmaer2015-07-212-2/+38
| * | | | Merge branch 'changelog_update' into 'master' Valery Sizov2015-07-211-2/+2
| |\ \ \ \
| | * | | | Update changelogchangelog_updateValery Sizov2015-07-211-2/+2
| |/ / / /
View Lorry Controller Status