Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'api-delete-note' into 'master' | Rémy Coutable | 2016-04-12 | 2 | -0/+76 |
|\ | |||||
| * | Adapt tests to new testing guidelines | Robert Schilling | 2016-04-12 | 2 | -11/+10 |
| * | Fix code review issues | Robert Schilling | 2016-04-12 | 2 | -5/+24 |
| * | Delete notes via API | Robert Schilling | 2016-04-12 | 2 | -0/+58 |
* | | Merge branch 'api-get-tag' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+17 |
|\ \ | |||||
| * | | Fix minor styling issues from code review | Robert Schilling | 2016-04-12 | 1 | -3/+3 |
| * | | API: Ability to retrieve a single tag | Robert Schilling | 2016-04-12 | 1 | -0/+17 |
* | | | Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687 | Zeger-Jan van de Weg | 2016-04-12 | 1 | -3/+17 |
| |/ |/| | |||||
* | | API: Add iid filter to milestones | Robert Schilling | 2016-04-12 | 1 | -3/+5 |
|/ | |||||
* | Merge branch 'issue_1752' into 'master' | Robert Speicher | 2016-04-11 | 1 | -4/+19 |
|\ | |||||
| * | improve specs code syntaxissue_1752 | Felipe Artur | 2016-04-07 | 1 | -11/+11 |
| * | Fix milestone removal problem when editing issues | Felipe Artur | 2016-04-06 | 1 | -0/+15 |
* | | Merge branch 'dashboard-filter-milestone' into 'master' | Jacob Schatz | 2016-04-11 | 1 | -0/+54 |
|\ \ | |||||
| * | | Fixed issue with dashboard/issues not filtering by milestonedashboard-filter-milestone | Phil Hughes | 2016-04-11 | 1 | -0/+54 |
* | | | Merge branch 'metrics-measure-block-transaction' into 'master' | Yorick Peterse | 2016-04-11 | 2 | -11/+14 |
|\ \ \ | |||||
| * | | | Fixed stubbing for Gitlab::Metrics specs | Yorick Peterse | 2016-04-11 | 1 | -1/+1 |
| * | | | Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transaction | Yorick Peterse | 2016-04-11 | 1 | -0/+3 |
| * | | | Added specs for Gitlab::Metrics::System.cpu_time | Yorick Peterse | 2016-04-11 | 1 | -0/+6 |
| * | | | Store block timings as transaction values | Yorick Peterse | 2016-04-11 | 1 | -11/+5 |
| |/ / | |||||
* | | | Merge branch 'rs-form_errors' into 'master' | Dmitriy Zaporozhets | 2016-04-11 | 1 | -0/+46 |
|\ \ \ | |||||
| * | | | Standardize the way we check for and display form errorsrs-form_errors | Robert Speicher | 2016-04-04 | 1 | -0/+46 |
* | | | | Merge branch 'mr-ui-update' into 'master' | Jacob Schatz | 2016-04-11 | 1 | -3/+8 |
|\ \ \ \ | |||||
| * | | | | Build fix | Phil Hughes | 2016-04-06 | 1 | -3/+8 |
* | | | | | Merge branch 'rs-remove-markdown-tips' into 'master' | Dmitriy Zaporozhets | 2016-04-11 | 1 | -7/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Remove `random_markdown_tip` helperrs-remove-markdown-tips | Robert Speicher | 2016-04-09 | 1 | -7/+0 |
* | | | | | write test to prevent reoccurence of issueprevent_users_from_upvoting_downvoting_emoji | Arinde Eniola | 2016-04-09 | 1 | -0/+64 |
|/ / / / | |||||
* | | | | Merge branch '14400-diff-redesign' into 'master' | Jacob Schatz | 2016-04-09 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Diff design updates | Annabel Dunstone | 2016-04-07 | 1 | -1/+1 |
| * | | | | Update diff colors and icons | Annabel Dunstone | 2016-04-07 | 1 | -1/+1 |
* | | | | | Instrument Rails cache codeinstrument-rails-cache | Yorick Peterse | 2016-04-08 | 1 | -0/+71 |
|/ / / / | |||||
* | | | | Merge branch 'issue_14012' into 'master' | Rémy Coutable | 2016-04-07 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Implement review suggestions | Felipe Artur | 2016-04-07 | 1 | -1/+1 |
| * | | | | Improve code | Felipe Artur | 2016-04-05 | 1 | -1/+1 |
| * | | | | Fix problem when creating milestones in groups without projects | Felipe Artur | 2016-04-05 | 1 | -0/+6 |
* | | | | | Merge branch 'regex-for-colons' into 'master' | Douwe Maan | 2016-04-07 | 1 | -0/+115 |
|\ \ \ \ \ | |||||
| * | | | | | Remove dumb debug statement and add many tests. | Jacob Schatz | 2016-04-07 | 1 | -0/+115 |
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Grzegorz Bizon | 2016-04-07 | 1 | -0/+101 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch 'fix/2fa-authentication-spoofing' into 'master' | Rémy Coutable | 2016-04-07 | 1 | -0/+101 |
| |\ \ \ \ \ | |||||
| | * | | | | | Make sessions controller specs more explicit | Grzegorz Bizon | 2016-04-07 | 1 | -4/+5 |
| | * | | | | | Fix 2FA authentication spoofing vulnerability | Grzegorz Bizon | 2016-04-07 | 1 | -35/+42 |
| | * | | | | | Add specs for sessions controller including 2FA | Grzegorz Bizon | 2016-04-06 | 1 | -0/+93 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Merge branch 'fix-project-404-cache-issue' into 'master' | Yorick Peterse | 2016-04-07 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Expire caches after project creation to ensure a consistent state | Stan Hu | 2016-04-07 | 1 | -0/+13 |
* | | | | | | | Merge branch 'update_main_lang_if_unset' into 'master' | Rémy Coutable | 2016-04-07 | 1 | -5/+21 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Only update main language if it is not already setupdate_main_lang_if_unset | Drew Blessing | 2016-04-06 | 1 | -5/+21 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'api-filter-milestone' into 'master' | Rémy Coutable | 2016-04-07 | 1 | -0/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Improve coding and doc style | Robert Schilling | 2016-04-06 | 1 | -3/+5 |
| * | | | | | | API: Ability to filter milestones by state | Robert Schilling | 2016-04-06 | 1 | -0/+17 |
* | | | | | | | Merge branch 'feature/expose-builds-badge' into 'master' | Rémy Coutable | 2016-04-07 | 2 | -1/+66 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add feature specs for list of badges page | Grzegorz Bizon | 2016-04-06 | 1 | -0/+34 |