summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* disable webpack proxy in rspec environment due to conflicts with webmock gemMike Greiling2017-02-021-12/+20
* remove changes to ProcfileMike Greiling2017-02-011-1/+0
* configure webpack dev server port via environment variableMike Greiling2017-02-011-10/+2
* add rack middleware to proxy webpack dev serverMike Greiling2017-02-017-0/+71
* remove dev-server config from development environmentMike Greiling2017-01-311-7/+0
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-31176-850/+1829
|\
| * Merge branch 'cop-gem-fetcher' into 'master' Robert Speicher2017-01-313-0/+33
| |\
| | * cop for gem fetched from a git sourceAdam Pahlevi2017-01-312-0/+29
| | * add complete changelogAdam Pahlevi2017-01-311-0/+4
| * | Merge branch 'correct-gitlab-host-references' into 'master' Achilleas Pipinellis2017-01-314-6/+5
| |\ \
| | * | Corrected docs href'scorrect-gitlab-host-referencesLuke "Jared" Bennett2017-01-304-6/+5
| * | | Merge branch '23767-disable-storing-of-sensitive-information' into 'master' Filipa Lacerda2017-01-313-4/+22
| |\ \ \
| | * | | Fix disable storing of sensitive information when importing a new repo23767-disable-storing-of-sensitive-informationClement Ho2017-01-303-4/+22
| * | | | Merge branch '395-fix-notification-when-group-set-to-watch' into 'master'Sean McGivern2017-01-313-6/+30
| |\ \ \ \
| | * | | | Fix notification when global=disabled, group=watch395-fix-notification-when-group-set-to-watchamaia2017-01-303-6/+30
| | |/ / /
| * | | | Merge branch 'fix/27479' into 'master' Sean McGivern2017-01-313-6/+20
| |\ \ \ \
| | * | | | Fix small typo on new branch button specfix/27479Douglas Barbosa Alexandre2017-01-311-1/+1
| | * | | | Add CHANGELOG entryDouglas Barbosa Alexandre2017-01-311-0/+4
| | * | | | Remove new branch button for confidential issuesDouglas Barbosa Alexandre2017-01-312-5/+15
| * | | | | Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'27283-fix-wrong-label-hide-show-whitespaceSean McGivern2017-01-317-1/+344
| |\ \ \ \ \
| | * | | | | Abillity to promote project labels to group labelsRitave2017-01-317-1/+344
| * | | | | | Merge branch '27474-update-auto-deploy-requires-public-project' into 'master' Achilleas Pipinellis2017-01-311-1/+2
| |\ \ \ \ \ \
| | * | | | | | Update index.md27474-update-auto-deploy-requires-public-projectJoshua Lambert2017-01-311-1/+1
| | * | | | | | Clarify that Auto Deploy requires a public project.Joshua Lambert2017-01-311-1/+2
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'improve-process' into 'master' Achilleas Pipinellis2017-01-311-77/+23
| |\ \ \ \ \ \
| | * | | | | | Remove outdated text and link to up-to-date documentationimprove-processRémy Coutable2017-01-251-77/+23
| * | | | | | | Merge branch '27488-fix-jwt-version' into 'master' Kamil Trzciński2017-01-313-4/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Update and pin the `jwt` gem to ~> 1.5.627488-fix-jwt-versionRémy Coutable2017-01-313-4/+8
| * | | | | | | | Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-...Kamil Trzciński2017-01-3118-53/+62
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixes after review25910-convert-manual-action-icons-to-svg-to-propperly-position-themFilipa Lacerda2017-01-262-5/+5
| | * | | | | | | | Removed unused methodFilipa Lacerda2017-01-262-7/+0
| | * | | | | | | | Fix broken testsFilipa Lacerda2017-01-256-15/+15
| | * | | | | | | | Remove unneeded 'borderless' from icons nameFilipa Lacerda2017-01-258-5/+5
| | * | | | | | | | changelog entrydimitrieh2017-01-251-0/+4
| | * | | | | | | | fixed pipeline graph action buttons and counter badge positioningdimitrieh2017-01-251-23/+19
| | * | | | | | | | added icons and fixed mini pipeline action dropdown iconsdimitrieh2017-01-2511-8/+24
| * | | | | | | | | Merge branch '26852-fix-slug-for-openshift' into 'master' Kamil Trzciński2017-01-314-10/+35
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Avoid repeated dashes in $CI_ENVIRONMENT_SLUGNick Thomas2017-01-234-10/+35
| * | | | | | | | | | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-316-9/+19
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Updated test for new error resultzj-display-error-team-fetchLuke "Jared" Bennett2017-01-301-1/+1
| | * | | | | | | | | | Update #list_teams to propagate errorsZ.J. van de Weg2017-01-306-14/+12
| | * | | | | | | | | | Added error message and testLuke "Jared" Bennett2017-01-243-1/+13
| | * | | | | | | | | | Fix inconsistent return typeZ.J. van de Weg2017-01-245-11/+11
| * | | | | | | | | | | Merge branch '24795_refactor_merge_request_build_service' into 'master' Sean McGivern2017-01-313-58/+77
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | refactor merge request build serviceRydkin Maxim2017-01-313-58/+77
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'patch-12' into 'master' James Lopez2017-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Services changed to Integrations to slack.mdDoğukan KOTAN2017-01-211-1/+1
| * | | | | | | | | | | Merge branch 'remove-warning-to-login' into 'master' Rémy Coutable2017-01-313-1/+11
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove flash warning from login pagePadilla, Gerald2017-01-303-1/+11
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'ensure-rake-is-called-within-the-correct-bundle-context' into '...Rémy Coutable2017-01-311-4/+4
| |\ \ \ \ \ \ \ \ \ \ \