summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into ...Grzegorz Bizon2018-05-212-1/+7
|\ \ \ \
| * | | | Separate persisted and runtime pipeline variablesGrzegorz Bizon2018-05-182-1/+2
| * | | | Do not allow to use `CI_PIPELINE_ID` in environment nameGrzegorz Bizon2018-05-181-2/+7
* | | | | Merge branch 'add-broadcast-message-timezone-label' into 'master'Kamil Trzciński2018-05-211-2/+2
|\ \ \ \ \
| * | | | | Add timezone information to the date time select labelsAndreas Kämmerle2018-05-161-2/+2
* | | | | | Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master'Kamil Trzciński2018-05-214-5/+20
|\ \ \ \ \ \
| * | | | | | Revert "Improve cacheable module"46082-runner-contacted_at-is-not-always-a-time-typeMatija Čupić2018-05-181-7/+5
| * | | | | | Improve cacheable moduleKamil Trzciński2018-05-181-5/+7
| * | | | | | Include class name and argument name in argument errorMatija Čupić2018-05-171-1/+3
| * | | | | | Use Gitlab.rails5? for checking if on rails5Matija Čupić2018-05-171-3/+3
| * | | | | | Revert "Move argument check to cached getter definition class method"Matija Čupić2018-05-161-2/+2
| * | | | | | Move argument check to cached getter definition class methodMatija Čupić2018-05-161-2/+2
| * | | | | | Add attribute check in cached getterMatija Čupić2018-05-161-0/+2
| * | | | | | Move attribute casting to #cached_attributeMatija Čupić2018-05-161-4/+3
| * | | | | | Dynamically cast value from cacheMatija Čupić2018-05-152-11/+11
| * | | | | | Clear memoization after caching new valuesMatija Čupić2018-05-111-0/+2
| * | | | | | Use symbol instead of string in RedisCacheable attribute definitionsMatija Čupić2018-05-101-2/+2
| * | | | | | Merge branch 'master' into 46082-runner-contacted_at-is-not-always-a-time-typeMatija Čupić2018-05-0924-86/+89
| |\ \ \ \ \ \
| * | | | | | | Revert "Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runn...Matija Čupić2018-05-092-2/+2
| * | | | | | | Move Runner#contacted_at to RedisCacheable#cached_attr_time_readerMatija Čupić2018-05-081-1/+2
| * | | | | | | Add cached_attr_time_reader to RedisCacheableMatija Čupić2018-05-081-0/+9
* | | | | | | | Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master'Kamil Trzciński2018-05-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes deploy tokens build variables46454-wrong-value-in-ci-deploy-userMayra Cabrera2018-05-181-1/+1
* | | | | | | | | Merge branch 'jr-web-ide-shortcuts' into 'master'Tim Zallmann2018-05-211-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add web shortcut to docs and shortcut modaljr-web-ide-shortcutsJames Ramsay2018-05-181-0/+11
| |/ / / / / / / /
* | | | | | | | | Merge branch '5845-extract-ee-environments-files' into 'master'Phil Hughes2018-05-213-27/+19
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-filesFilipa Lacerda2018-05-1845-456/+611
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
View Lorry Controller Status