summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '39710-search-placeholder-cut-off' into 'master'Annabel Gray2018-05-236-29/+11
|\
| * Fixes: Runners search input placeholder is cut offJacopo2018-05-236-29/+11
* | Merge branch 'ldap-u2f-fix' into 'master'Mike Greiling2018-05-231-0/+3
|\ \
| * | Fixed U2F authentication when used with LDAPPhil Hughes2018-05-231-0/+3
* | | Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-...Douwe Maan2018-05-235-47/+61
|\ \ \
| * | | Use ApplicationSetting.current_without_cache instead of ApplicationSetting.cu...Rémy Coutable2018-05-231-1/+1
| * | | Use the new CacheableAttributes concern in the ApplicationSetting and Appeara...Rémy Coutable2018-05-233-46/+6
| * | | Introduce a new CacheableAttributes concernRémy Coutable2018-05-231-0/+54
* | | | Merge branch 'fix/devops-remove-beta' into 'master'Tim Zallmann2018-05-234-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | removed "(Beta)" from "Auto DevOps" messagesfix/devops-remove-betaPaul Slaughter2018-05-214-4/+4
* | | | Render 404 when prometheus adapter is disabled in Prometheus metrics controllerTiago Botelho2018-05-231-1/+1
| |/ / |/| |
* | | Merge branch 'ce_backport_issue_5128' into 'master'Rémy Coutable2018-05-232-6/+14
|\ \ \
| * | | CE backport - Allow viewing only one board when multiple issue boards is not ...ce_backport_issue_5128Felipe Artur2018-05-222-6/+14
* | | | CE: Use render_if_exists to hide EE specific codesLin Jen-Shin2018-05-232-0/+14
* | | | Merge branch 'rs-boards-issues-create-service-parity' into 'master'Rémy Coutable2018-05-231-1/+5
|\ \ \ \
| * | | | Bring CE-EE parity to app/services/boards/issues/create_service.rbrs-boards-issues-create-service-parityRobert Speicher2018-05-221-1/+5
* | | | | Resolve "Deprecate Gemnasium project service"Olivier Gonzalez2018-05-232-1/+13
* | | | | Resolve "Web IDE doesn't work for branches with slashes"Tim Zallmann2018-05-236-19/+32
* | | | | Merge branch 'ide-commit-state-bug' into 'master'Filipa Lacerda2018-05-231-2/+7
|\ \ \ \ \
| * | | | | Fixed web IDE review & commit editors getting into incorrect statePhil Hughes2018-05-181-2/+7
* | | | | | Merge branch 'ide-jobs-list' into 'master'Filipa Lacerda2018-05-238-0/+152
|\ \ \ \ \ \
| * | | | | | group jobs into stageside-jobs-listPhil Hughes2018-05-225-14/+43
| * | | | | | added getter for checking is their is a pipelinePhil Hughes2018-05-224-7/+12
| * | | | | | Show CI jobs in web IDEPhil Hughes2018-05-227-0/+118
* | | | | | | Merge branch 'ide-file-finder-improve-order' into 'master'Filipa Lacerda2018-05-232-7/+8
|\ \ \ \ \ \ \
| * | | | | | | changed what bit of code stops the callbackide-file-finder-improve-orderPhil Hughes2018-05-221-4/+5
| * | | | | | | Fixed IDE file finder orderingPhil Hughes2018-05-142-7/+7
* | | | | | | | Merge branch '44895-explicit-merge-conflict' into 'master'Tim Zallmann2018-05-224-8/+24
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix sentence for i18n44895-explicit-merge-conflictAnnabel Dunstone Gray2018-05-211-6/+4
| * | | | | | | Add internationlization for conflict descriptionAnnabel Dunstone Gray2018-05-211-4/+4
| * | | | | | | Update copy; add monospace font to branch namesAnnabel Dunstone Gray2018-05-212-5/+5
| * | | | | | | Make source branch a linkAnnabel Dunstone Gray2018-05-211-1/+1
| * | | | | | | Fix merge conflict infoAnnabel Dunstone Gray2018-05-211-1/+7
| * | | | | | | Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-213-6/+18
* | | | | | | | Use "right now" for short time periodsWinnie Hellmann2018-05-221-19/+80
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'dm-xcode-project-directory' into 'master'Robert Speicher2018-05-221-5/+15
|\ \ \ \ \ \ \
| * | | | | | | Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directoryDouwe Maan2018-05-221-5/+15
* | | | | | | | unverified hover state color changed to almost-blackMurat Dogan2018-05-221-0/+4
* | | | | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e...Douwe Maan2018-05-221-8/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmedRémy Coutable2018-05-221-8/+19
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ab-43706-composite-primary-keys' into 'master'Yorick Peterse2018-05-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add NOT NULL constraints to project_authorizations.Andreas Brandl2018-05-211-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Expose readme url in Project APIImre Farkas2018-05-221-0/+7
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'rename-merge-request-widget-author-component' into 'master'Phil Hughes2018-05-223-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Rename merge request widget author componentGeorge Tsiolis2018-05-223-5/+5
* | | | | | | | Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into '...Douwe Maan2018-05-222-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fixed badge api endpoint route when relative_url is setfj-46411-fix-badge-api-endpoint-route-with-relative-urlFrancisco Javier López2018-05-172-4/+4
* | | | | | | | Renamed 'Overview' to 'Project' in collapsed contextual navigation at a proje...Constance Okoghenun2018-05-211-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch '45746-fix-container-registry-typo' into 'master'Rémy Coutable2018-05-211-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix a typo in the Registry indexMark Fletcher2018-05-031-1/+1
View Lorry Controller Status