summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added empty state svg and set up blank conditional20840-getting-started-better-empty-state-for-issues-viewLuke "Jared" Bennett2016-11-1812-47/+98
* Merge branch 'docs/jira-old' into 'master' Achilleas Pipinellis2016-11-0823-198/+249
|\
| * Bring back the old JIRA docsAchilleas Pipinellis2016-11-0823-198/+249
* | Merge branch 'improve-build-scroll-controls-responsive-behaviour' into 'master' Fatih Acet2016-11-089-79/+325
|\ \
| * | Added new .eslintrc for jasmine tests and corrected build_specimprove-build-scroll-controls-responsive-behaviourLuke "Jared" Bennett2016-11-043-32/+45
| * | Add javascript unit tests for BuildJared Deckard2016-11-043-8/+239
| * | Removed inline JS and added new affix declarationLuke Bennett2016-11-045-72/+74
* | | Merge branch 'upgrade-timeago' into 'master' Fatih Acet2016-11-0819-289/+320
|\ \ \
| * | | Replace jQuery.timeago with timeago.jsClement Ho2016-11-0719-289/+320
* | | | Merge branch 'docs/docker-overlayfs-driver' into 'master' Achilleas Pipinellis2016-11-081-11/+58
|\ \ \ \
| * | | | Document the usage of the Docker OverlayFS driverdocs/docker-overlayfs-driverAchilleas Pipinellis2016-11-081-11/+58
* | | | | Merge branch 'rs-project_params' into 'master' Rémy Coutable2016-11-081-17/+35
|\ \ \ \ \
| * | | | | Apply `*_params_ce` pattern to ProjectsControllerrs-project_paramsRobert Speicher2016-11-071-17/+35
* | | | | | Merge branch 'fix-uncheckable-label-for-force_remove_source_branch' into 'mas...Robert Speicher2016-11-082-1/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Clicking "force remove source branch" label now toggles the checkbox againfix-uncheckable-label-for-force_remove_source_branchRémy Coutable2016-11-082-1/+5
* | | | | | Merge branch 'faster_project_search' into 'master' Sean McGivern2016-11-084-18/+33
|\ \ \ \ \ \
| * | | | | | Faster searchfaster_project_searchValery Sizov2016-11-084-18/+33
* | | | | | | Merge branch 'fix-new-branch-button-spec' into 'master' Sean McGivern2016-11-081-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix new branch button specfix-new-branch-button-specSean McGivern2016-11-041-3/+4
* | | | | | | | Merge branch 'dz-refactor-contraints' into 'master' Dmitriy Zaporozhets2016-11-089-76/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix routing spec for group controllerdz-refactor-contraintsDmitriy Zaporozhets2016-11-081-2/+2
| * | | | | | | | Add small improvements to constrainers and specsDmitriy Zaporozhets2016-11-084-4/+4
| * | | | | | | | Refactor routing constraintsDmitriy Zaporozhets2016-11-078-74/+81
* | | | | | | | | Merge branch '24255-search-fix' into 'master' Rémy Coutable2016-11-087-2/+66
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix broken commits search24255-search-fixValery Sizov2016-11-087-2/+66
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'move-boards-interceptor' into 'master' Fatih Acet2016-11-083-108/+116
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Move Ajax interceptor into describe block (!7304)winniehell2016-11-053-108/+116
* | | | | | | | Merge branch 'dz-refactor-project-routes' into 'master' Dmitriy Zaporozhets2016-11-086-183/+176
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor project routingdz-refactor-project-routesDmitriy Zaporozhets2016-11-076-183/+176
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dz-refactor-namespace-regex' into 'master' Sean McGivern2016-11-084-24/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Update non-exist group spinach test to match routingDmitriy Zaporozhets2016-11-081-1/+1
| * | | | | | | | Refactor namespace regexdz-refactor-namespace-regexDmitriy Zaporozhets2016-11-073-23/+28
| |/ / / / / / /
* | | | | | | | Merge branch 'sidekiq_default_retries' into 'master' Yorick Peterse2016-11-082-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Set default Sidekiq retries to 3Drew Blessing2016-11-042-0/+7
* | | | | | | | | Merge branch 'dz-refactor-group-routes' into 'master' Dmitriy Zaporozhets2016-11-081-19/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Refactor group routingdz-refactor-group-routesDmitriy Zaporozhets2016-11-071-19/+19
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-bump-omniauth-gitlab' into 'master' Robert Speicher2016-11-083-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2sh-bump-omniauth-gitlabStan Hu2016-11-073-3/+7
* | | | | | | | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-0826-60/+230
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-0722-59/+184
| * | | | | | | | | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-0712-34/+79
* | | | | | | | | | Merge branch 'todos-filter-empty-state' into 'master' Sean McGivern2016-11-082-9/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Changed helper method to check for none on paramsPhil Hughes2016-11-082-6/+6
| * | | | | | | | | | Fixed todos empty state when filteringtodos-filter-empty-statePhil Hughes2016-11-072-8/+16
* | | | | | | | | | | Merge branch 'dz-fix-project-index' into 'master' Sean McGivern2016-11-083-3/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix 404 when visit /projects pagedz-fix-project-indexDmitriy Zaporozhets2016-11-071-0/+1
| * | | | | | | | | | | Add tests for project#index routingDmitriy Zaporozhets2016-11-071-0/+20
| * | | | | | | | | | | Fix project indexDmitriy Zaporozhets2016-11-071-3/+3
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-systemhook-api' into 'master' Rémy Coutable2016-11-083-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | API: Return 400 when creating a systemhook failsRobert Schilling2016-11-083-1/+11