summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed rubocop failure for the add_two_factor_columns_migrationrubocop-fix-migration-two-factor-columnsJose Ivan Vargas2017-04-061-1/+1
* Merge branch 'gitaly-config-toml' into 'master' Sean McGivern2017-04-066-28/+44
|\
| * Fix rubocop offenceJacob Vosmaer2017-04-061-1/+1
| * Use config.toml to configure GitalyJacob Vosmaer2017-04-065-27/+43
* | Merge branch '29128-profile-page-icons' into 'master' Filipa Lacerda2017-04-0615-21/+64
|\ \
| * | Update commit icon; fix specs29128-profile-page-iconsAnnabel Dunstone Gray2017-04-033-7/+5
| * | Add changelogAnnabel Dunstone Gray2017-04-032-1/+5
| * | Add deleted branch iconAnnabel Dunstone Gray2017-04-031-1/+4
| * | Change color of iconsAnnabel Dunstone Gray2017-04-035-21/+40
| * | Differentiate between event typesAnnabel Dunstone Gray2017-04-036-14/+23
| * | Start adding profile iconsAnnabel Dunstone Gray2017-04-038-13/+23
* | | Merge branch '28899-linking-to-edit-file' into 'master' Alfredo Sumaran2017-04-0614-58/+313
|\ \ \
| * | | Linking to edit file directlyEric Eastwood2017-04-0614-58/+313
|/ / /
* | | Merge branch '27262-issue-recent-searches' into 'master' Jacob Schatz2017-04-0629-132/+906
|\ \ \
| * | | Recent search history for issuesEric Eastwood2017-04-0629-132/+906
* | | | Merge branch 'update-trace-handling-code' into 'master' Rémy Coutable2017-04-0629-633/+988
|\ \ \ \
| * | | | Optimise trace handling code to use streaming instead of full readKamil Trzciński2017-04-0629-633/+988
|/ / / /
* | | | Merge branch 'feature/enforce-2fa-per-group' into 'master' Douwe Maan2017-04-0627-92/+829
|\ \ \ \ | |_|_|/ |/| | |
| * | | user#update_two_factor_requirement is publicAlexis Reigel2017-04-061-8/+8
| * | | use more explicit and explanatory sql statementAlexis Reigel2017-04-062-8/+26
| * | | rename cache db column with `_cached` suffixAlexis Reigel2017-04-066-12/+12
| * | | check all groups for 2fa requirementAlexis Reigel2017-04-064-6/+53
| * | | add method to get a full routable hierarchyAlexis Reigel2017-04-062-1/+160
| * | | state the reason to the user for the required 2faAlexis Reigel2017-04-063-33/+130
| * | | Rename skip_tfa session variable to skip_two_factorMarkus Koller2017-04-063-3/+3
| * | | Rename check_2fa_requirement to check_two_factor_requirementMarkus Koller2017-04-064-8/+8
| * | | Extract 2FA-related code from ApplicationControllerMarkus Koller2017-04-062-39/+48
| * | | Support 2FA requirement per-groupMarkus Koller2017-04-0620-21/+433
| * | | Move AuthHelper#two_factor_skippable? into ApplicationControllerMarkus Koller2017-04-062-12/+7
* | | | Merge branch 'use-gitaly-find-ref-name' into 'master' Sean McGivern2017-04-064-12/+45
|\ \ \ \
| * | | | Hopefully this worksuse-gitaly-find-ref-nameKim "BKC" Carlbäcker2017-04-062-2/+2
| * | | | CleanupKim "BKC" Carlbäcker2017-04-061-2/+2
| * | | | rubocopKim "BKC" Carlbäcker2017-04-061-1/+0
| * | | | Use Gitaly for Environment#first_deployment_forKim "BKC" Carlbäcker2017-04-064-12/+46
* | | | | Merge branch 'add-dimension-etag-caching-metrics' into 'master' Sean McGivern2017-04-063-24/+40
|\ \ \ \ \
| * | | | | Include endpoint in metrics for ETag caching middlewareAdam Niedzielski2017-04-063-24/+40
| |/ / / /
* | | | | Merge branch '29470-make-modal-sizes-consistent-and-mobile-friendly' into 'ma...Annabel Dunstone Gray2017-04-063-6/+4
|\ \ \ \ \
| * | | | | Remove individual modal width stylesSam Rose2017-04-063-6/+4
* | | | | | Merge branch 'user-page-horizontal-scrolling' into 'master' Annabel Dunstone Gray2017-04-061-0/+8
|\ \ \ \ \ \
| * | | | | | Fixed user profile tabs causing the page to scrolluser-page-horizontal-scrollingPhil Hughes2017-04-031-0/+8
* | | | | | | Merge branch '30024-owner-can-t-initialize-git-repo-for-new-project-in-group'...Sean McGivern2017-04-063-0/+23
|\ \ \ \ \ \ \
| * | | | | | | Fix RuboCop for removing index30024-owner-can-t-initialize-git-repo-for-new-project-in-groupSean McGivern2017-04-061-0/+1
| * | | | | | | Disable invalid service templates (again)Sean McGivern2017-04-062-0/+22
* | | | | | | | Merge branch 'ee-mrs-on-freeze-date' into 'master' Douwe Maan2017-04-061-1/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Link to docs site for file in doc/ee-mrs-on-freeze-dateSean McGivern2017-04-061-1/+1
| * | | | | | | | Large features by the 1st, small ones by the 3rdSean McGivern2017-04-051-0/+23
| * | | | | | | | Ask people to create EE MRs on the 7thSean McGivern2017-04-051-1/+23
* | | | | | | | | Merge branch 'dz-inherit-create-group-permission' into 'master' Douwe Maan2017-04-062-8/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add more tests for subgroups featuredz-inherit-create-group-permissionDmitriy Zaporozhets2017-04-052-8/+47
* | | | | | | | | | Merge branch '29807-improve-triggers-edit-and-delete-buttons-alignment' into ...Annabel Dunstone Gray2017-04-061-0/+2
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status