summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-gitlab-http-blocked-url-error' into 'master'Robert Speicher2018-04-023-4/+10
|\
| * Rename allow_private_networks to allow_local_networkDouwe Maan2018-04-021-5/+3
| * Added rescue to show a custom error when testing project integrationsFrancisco Javier López2018-04-021-0/+2
| * Raise more descriptive errors when URLs are blockedDouwe Maan2018-04-022-3/+9
* | Resolve "Clicking confidential and lock icons on sidebar should also activate...Dennis Tang2018-04-026-162/+216
* | Merge branch 'dz-type-button' into 'master'Filipa Lacerda2018-04-027-14/+14
|\ \ | |/ |/|
| * Add button type to settings toggledz-type-buttonDmitriy Zaporozhets2018-04-027-14/+14
* | Backport changes in EE MR 4972: System Header and FooterAndré Luís2018-04-0210-32/+831
* | Merge branch 'ce-jej/settings-for-saml-sso-per-group' into 'master'Sean McGivern2018-04-022-0/+16
|\ \
| * | Adds validators and rack cookie helperJames Edwards-Jones2018-04-022-0/+16
| |/
* | apply feedbackMicaël Bergeron2018-04-021-1/+15
* | fix the rake task from being to strict about GroupMicaël Bergeron2018-04-021-9/+7
|/
* Merge branch 'dz-improve-app-settings-3' into 'master'Filipa Lacerda2018-04-025-114/+154
|\
| * Move background jobs, spam and performance bar app settings to expandable sec...dz-improve-app-settings-3Dmitriy Zaporozhets2018-03-295-114/+154
* | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master'Kamil Trzciński2018-04-021-43/+84
|\ \
| * | Improve naming and optimize methods of the build classGrzegorz Bizon2018-03-301-2/+8
| * | Memoize environment-specific methods in build classGrzegorz Bizon2018-03-291-5/+9
| * | Extract build variables that depend on persistenceGrzegorz Bizon2018-03-291-24/+31
| * | Merge branch 'master' into 'feature/gb/variables-expressions-in-only-except'Grzegorz Bizon2018-03-29134-1332/+2475
| |\ \
| * | | Add specs for method that exposes build variables hashGrzegorz Bizon2018-03-271-3/+0
| * | | Decouple build variables from persisted environmentGrzegorz Bizon2018-03-271-28/+42
| * | | Merge branch 'master' into feature/gb/variables-expressions-in-only-exceptGrzegorz Bizon2018-03-27229-1238/+6637
| |\ \ \
| * | | | Expose evaluable variables method from build objectGrzegorz Bizon2018-03-231-2/+13
| * | | | Make it possible to access static builds variablesGrzegorz Bizon2018-03-231-7/+10
* | | | | Merge branch '44291-usage-ping-for-kubernetes-integration' into 'master'Kamil Trzciński2018-04-022-0/+6
|\ \ \ \ \
| * | | | | Extract cluster installed query to scopeMatija Čupić2018-03-301-0/+2
| * | | | | Extract installed cluster application scope to concernMatija Čupić2018-03-295-8/+2
| * | | | | Merge branch 'master' into 44291-usage-ping-for-kubernetes-integrationMatija Čupić2018-03-29233-2046/+3630
| |\ \ \ \ \
| * | | | | | Add installed scope to cluster applicationsMatija Čupić2018-03-294-0/+8
| * | | | | | Add user_provided and gcp_provided cluster scopesMatija Čupić2018-03-291-0/+2
* | | | | | | Merge branch 'tz-ide-open-mr' into 'master'Phil Hughes2018-04-0128-392/+754
|\ \ \ \ \ \ \
| * | | | | | | Fixed Utility Function based on Review CommentsTim Zallmann2018-03-283-11/+4
| * | | | | | | Removed strangely added importTim Zallmann2018-03-281-2/+0
| * | | | | | | Added Utility Function for WebIDE URLTim Zallmann2018-03-282-2/+13
| * | | | | | | Fixed Code review CommentsTim Zallmann2018-03-288-70/+49
| * | | | | | | Fixes for ESLint ErrorsTim Zallmann2018-03-282-4/+12
| * | | | | | | Fixed Path to tooltip directiveTim Zallmann2018-03-281-1/+1
| * | | | | | | Added Changes based on UX ReviewTim Zallmann2018-03-289-63/+100
| * | | | | | | Re added The Web IDE ButtonTim Zallmann2018-03-281-43/+54
| * | | | | | | Fixes for Tests on file.js and tabs testsTim Zallmann2018-03-281-23/+20
| * | | | | | | Fix for MR Widget Header resetTim Zallmann2018-03-281-43/+43
| * | | | | | | Fixes to Formatting to all FilesTim Zallmann2018-03-2814-202/+32
| * | | | | | | ESLint + Karma fixesTim Zallmann2018-03-286-82/+26
| * | | | | | | Fixed new AdditionsTim Zallmann2018-03-287-11/+15
| * | | | | | | Actual MR diff displayedTim Zallmann2018-03-2816-339/+195
| * | | | | | | Basic Setup for MR ShowingTim Zallmann2018-03-2823-314/+1006
* | | | | | | | Extend API for exporting a project with direct upload URLFrancisco Javier López2018-03-303-13/+50
* | | | | | | | Merge branch '41967_issue_api_closed_by_info' into 'master'Sean McGivern2018-03-302-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | changed the way of nullifying columshaseeb2018-03-052-1/+5
| * | | | | | | | nullify closed by on reopenning issuehaseeb2018-03-031-0/+1
View Lorry Controller Status