summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/gpg-verification-status' into 'master'Douwe Maan2017-09-0517-62/+107
|\
| * set the popover's viewport to the main contentAlexis Reigel2017-09-051-1/+4
| * use local_assigns to document partial paramsAlexis Reigel2017-09-051-1/+8
| * dry up signature badge templatesAlexis Reigel2017-09-055-36/+18
| * make valid_signature an ignored columnAlexis Reigel2017-09-051-0/+3
| * drop backwards compatibility for valid_signatureAlexis Reigel2017-09-051-8/+0
| * use User#to_reference for outputting the usernameAlexis Reigel2017-09-051-1/+1
| * update signature badges to reflect new statesAlexis Reigel2017-09-057-5/+30
| * use new #verification_statusAlexis Reigel2017-09-053-6/+17
| * extract partial for the signature badge userAlexis Reigel2017-09-052-21/+22
| * use User#verified_email? for gpg key verificationAlexis Reigel2017-09-051-2/+2
| * add User##verified_email? methodAlexis Reigel2017-09-051-0/+4
| * simplify check for verified email in collectionAlexis Reigel2017-09-051-2/+2
| * add verification_status: same_user_different_emailAlexis Reigel2017-09-051-3/+4
| * match the committer's email against the gpg keyAlexis Reigel2017-09-052-0/+12
| * pass whole commit to Gitlab::Gpg::Commit againAlexis Reigel2017-09-053-3/+7
* | Creates an icon only for the discussions and puts back the old SVG for CI statusFilipa Lacerda2017-09-053-2/+3
* | Fix diff comment button not showing after deleting a commentPhil Hughes2017-09-053-6/+14
|/
* Merge branch 'issue-api-my-reaction' into 'master'Sean McGivern2017-09-052-0/+2
|\
| * Add my_reaction_emoji param to /merge_requests APIHiroyuki Sato2017-09-051-0/+1
| * Add my_reaction_emoji param to /issues APIHiroyuki Sato2017-09-051-0/+1
* | Merge branch 'fix/sm/35650-remove-createtriggerrequestservice-and-forbid-to-p...Kamil Trzciński2017-09-054-23/+19
|\ \
| * | Move trigger_variables to presenterShinya Maeda2017-09-042-12/+13
| * | trigger_variables should consider trigger_request existstance alwaysShinya Maeda2017-09-043-17/+16
| * | Remove ci_trigger_request_with_variablesShinya Maeda2017-09-042-2/+13
| * | Fix specShinya Maeda2017-09-041-1/+1
| * | Remove CreateTriggerRequestService and forbit to save variables on Ci::Trigge...Shinya Maeda2017-09-042-19/+4
* | | Merge branch 'feature/sm/37239-implement-failure_reason-on-ci_builds' into 'm...Kamil Trzciński2017-09-053-2/+15
|\ \ \
| * | | Use script_failure. Add runner_system_failure. Improve spec.feature/sm/37239-implement-failure_reason-on-ci_buildsShinya Maeda2017-09-052-3/+4
| * | | - Allow runner API to pass failure_reasonShinya Maeda2017-09-051-1/+1
| * | | Fix enum listsShinya Maeda2017-09-054-13/+7
| * | | Fix enum wordingShinya Maeda2017-09-053-3/+3
| * | | Implement `failure_reason` on `ci_builds`Shinya Maeda2017-09-054-3/+21
| | |/ | |/|
* | | Merge branch 'additional-time-series-charts' into 'master'Tim Zallmann2017-09-059-152/+286
|\ \ \
| * | | Corrected collate functionJose Ivan Vargas2017-09-011-1/+1
| * | | refactor monitoring_store.jsMike Greiling2017-09-011-41/+37
| * | | simplify storeMetrics methodMike Greiling2017-09-011-6/+6
| * | | Increased opacity from 0.10 to 0.25Jose Ivan Vargas2017-09-011-1/+1
| * | | Added simple support for multiple colors on the different time seriesJose Ivan Vargas2017-08-315-18/+43
| * | | Increased the height of the graph when dealing with 3 plus legendsJose Ivan Vargas2017-08-301-3/+3
| * | | Corrected y scale for multiple time series and visual improvementsJose Ivan Vargas2017-08-302-12/+18
| * | | Fixed scss linter errorsJose Ivan Vargas2017-08-301-1/+1
| * | | Added and corrected specs for the additional time seriesJose Ivan Vargas2017-08-303-55/+46
| * | | Added vertical spacing when there's multiple legendsJose Ivan Vargas2017-08-304-21/+40
| * | | Refactored deployment mixinsJose Ivan Vargas2017-08-302-3/+2
| * | | Added legends for each of the time seriesJose Ivan Vargas2017-08-302-34/+52
| * | | Refactored the monitoring_column component to process all of the time seriesJose Ivan Vargas2017-08-301-45/+77
| * | | Converted the dates for each time series on the storeJose Ivan Vargas2017-08-301-6/+14
| * | | Added monitoring_paths component to show multiple time series on a single chartJose Ivan Vargas2017-08-301-0/+40
* | | | Merge branch 'winh-move-issue-project-dropdown' into 'master'Phil Hughes2017-09-051-0/+1
|\ \ \ \
View Lorry Controller Status