summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* adds max-width only for new filter dropdown27726-fix-dropdown-width-in-admin-project-pageNur Rony2017-02-091-1/+1
* adds changelogNur Rony2017-02-091-0/+4
* fixes dropdown width in admin project pageNur Rony2017-02-091-1/+4
* Merge branch 'docs/omniauth-fix-link' into 'master' Achilleas Pipinellis2017-02-0911-11/+11
|\
| * Fix markdown link in Omniauth docsAchilleas Pipinellis2017-02-0911-11/+11
|/
* Merge branch 'docs/omniauth-restart' into 'master' Achilleas Pipinellis2017-02-0911-32/+73
|\
| * Mention reconfigure/restart in omniauth docsAchilleas Pipinellis2017-02-0911-32/+73
|/
* Merge branch 'dm-add-column-with-default-cop' into 'master' Douwe Maan2017-02-097-8/+97
|\
| * Migration does not require downtimeDouwe Maan2017-02-081-0/+2
| * Satisfy the new rubocop :)Douwe Maan2017-02-082-2/+10
| * Explicitly require rubocop migration_helpersdm-add-column-with-default-copDouwe Maan2017-02-083-1/+4
| * Add cop that checks if add_column_with_default is used with up/down methodsDouwe Maan2017-02-085-5/+81
* | Merge branch 'feature-freeze-exceptions' into 'master' Robert Speicher2017-02-091-10/+28
|\ \
| * | Add an ordered list with the 3 people who need to sign offDouwe Maan2017-02-081-2/+8
| * | Rephrase some thingsfeature-freeze-exceptionsDouwe Maan2017-02-081-10/+12
| * | Too many releasesDouwe Maan2017-02-081-1/+1
| * | Small rephraseDouwe Maan2017-02-081-1/+1
| * | Describe process around cherry-picking during the feature freezeDouwe Maan2017-02-081-9/+19
| |/
* | Merge branch 'remove-jquery-ui-datepicker' into 'master' Jacob Schatz2017-02-0820-224/+183
|\ \
| * | Changed date check testremove-jquery-ui-datepickerPhil Hughes2017-02-066-31/+29
| * | Fixed missing edit link clickPhil Hughes2017-02-062-2/+3
| * | Fixed some specsPhil Hughes2017-02-068-36/+38
| * | Updated styles for PikadayPhil Hughes2017-02-068-172/+73
| * | Replaced more jQuery UI datepickersPhil Hughes2017-02-066-25/+70
| * | Removed jQuery UI datepickerPhil Hughes2017-02-067-14/+26
* | | Merge branch 'remove-jquery-ui-sortable' into 'master' Jacob Schatz2017-02-0819-135/+160
|\ \ \
| * | | Removed jQuery UI sortableremove-jquery-ui-sortablePhil Hughes2017-02-0619-135/+160
| |/ /
* | | Merge branch 'dz-fix-route-rename-descendants' into 'master' Dmitriy Zaporozhets2017-02-082-11/+28
|\ \ \ | |_|/ |/| |
| * | Fix route rename descendants if route.name is blankDmitriy Zaporozhets2017-02-082-11/+28
* | | Merge branch 'bypass-whitelist-for-external-user' into 'master' Robert Speicher2017-02-084-4/+36
|\ \ \ | |/ / |/| |
| * | Bypass signup domain validation for external usersReza Mohammadi2017-02-084-4/+36
* | | Merge branch 'mr-widget-pipelines' into 'master' Fatih Acet2017-02-081-0/+6
|\ \ \
| * | | Reduce padding of mr widget mini graphAnnabel Dunstone Gray2017-02-081-0/+6
* | | | Merge branch '27756-fix-json-404-response' into 'master' Clement Ho2017-02-084-5/+28
|\ \ \ \
| * | | | Remove sleep from testsClement Ho2017-02-081-2/+0
| * | | | Add tests27756-fix-json-404-responseAlfredo Sumaran2017-02-072-1/+25
| * | | | Fixes ajax requests when current URL has a trailing slashAlfredo Sumaran2017-02-073-5/+6
* | | | | Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master' Clement Ho2017-02-083-3/+11
|\ \ \ \ \
| * | | | | Looks for correct key to pass to commit prop. Adds rspec test.Filipa Lacerda2017-02-083-3/+11
* | | | | | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-0816-98/+191
|\ \ \ \ \ \
| * | | | | | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-0816-98/+191
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'widget-spec-failure' into 'master' Sean McGivern2017-02-081-2/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixed random merge request widget failurePhil Hughes2017-02-081-2/+0
* | | | | | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-0819-86/+89
|\ \ \ \ \ \
| * | | | | | Fix inconsistent naming for services that delete thingsdixpac2017-02-0819-86/+89
* | | | | | | Merge branch 'minigraph-fix' into 'master' Filipa Lacerda2017-02-081-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Listens on document for mini-pipeline graphminigraph-fixPhil Hughes2017-02-081-1/+1
* | | | | | | Merge branch 'backport-ee-build-fixes' into 'master' Filipa Lacerda2017-02-083-1/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | backport fixes for pipelines_store frontend specsbackport-ee-build-fixesMike Greiling2017-02-083-1/+15
* | | | | | | Merge branch 'patch-12' into 'master' Rémy Coutable2017-02-081-1/+1
|\ \ \ \ \ \ \