Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' | Robert Speicher | 2016-04-12 | 1 | -2/+13 |
|\ | |||||
| * | fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocomplete | Arinde Eniola | 2016-04-09 | 1 | -2/+13 |
* | | Merge branch 'decouple-member-notification' into 'master' | Douwe Maan | 2016-04-12 | 1 | -5/+10 |
|\ \ | |||||
| * \ | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-11 | 7 | -53/+138 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-08 | 42 | -232/+711 |
| |\ \ \ | |||||
| * | | | | Update API to use notification_level from notification_setting | Dmitriy Zaporozhets | 2016-03-30 | 1 | -5/+10 |
* | | | | | Merge branch 'fix-missing-saml-error-handling' into 'master' | Robert Speicher | 2016-04-12 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Better control flow and added guard clause.fix-missing-saml-error-handling | Patricio Cano | 2016-04-11 | 1 | -14/+9 |
| * | | | | | Add missing proper nil and error handling to SAML login process. | Patricio Cano | 2016-04-07 | 1 | -8/+14 |
* | | | | | | Merge branch 'api-delete-note' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Adapt tests to new testing guidelines | Robert Schilling | 2016-04-12 | 1 | -0/+2 |
| * | | | | | | Fix code review issues | Robert Schilling | 2016-04-12 | 1 | -4/+2 |
| * | | | | | | Delete notes via API | Robert Schilling | 2016-04-12 | 1 | -0/+17 |
* | | | | | | | Merge branch 'api-get-tag' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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/+14 |
* | | | | | | | | 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 | -4/+9 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'api-fix-milestone-iid-filter' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | API: Add iid filter to milestones | Robert Schilling | 2016-04-12 | 1 | -0/+2 |
| |/ / / / / / | |||||
* | | | | | | | API: Expose updated_at for notes | Robert Schilling | 2016-04-12 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'api-labels-info' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | API: Expose open_issues_count, closed_issues_count, open_merge_requests_count... | Robert Schilling | 2016-04-06 | 1 | -0/+1 |
* | | | | | | | Instrument Banzai code | Yorick Peterse | 2016-04-11 | 1 | -8/+12 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Fixed stubbing for Gitlab::Metrics specs | Yorick Peterse | 2016-04-11 | 1 | -4/+12 |
* | | | | | | Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transaction | Yorick Peterse | 2016-04-11 | 1 | -0/+1 |
* | | | | | | Store block timings as transaction values | Yorick Peterse | 2016-04-11 | 2 | -9/+25 |
* | | | | | | Merge branch 'redis-connection-pool' into 'master' | Robert Speicher | 2016-04-08 | 4 | -43/+64 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Put CACHE_NAMESPACE in the Gitlab::Redis module | Jacob Vosmaer | 2016-04-07 | 2 | -1/+3 |
| * | | | | | | Be careful when setting class instance vars | Jacob Vosmaer | 2016-04-04 | 1 | -2/+13 |
| * | | | | | | Add Gitlab::Redis connection pool | Jacob Vosmaer | 2016-04-04 | 3 | -16/+24 |
* | | | | | | | Merge branch 'instrument-rails-cache' into 'master' | Yorick Peterse | 2016-04-08 | 1 | -0/+39 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Instrument Rails cache codeinstrument-rails-cache | Yorick Peterse | 2016-04-08 | 1 | -0/+39 |
* | | | | | | | Merge branch 'metrics-timestamp-precision' into 'master' | Yorick Peterse | 2016-04-08 | 1 | -1/+21 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Use more accurate timestamps for InfluxDB.metrics-timestamp-precision | Yorick Peterse | 2016-04-08 | 1 | -1/+21 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | API: Expose subscribed? on issues | Robert Schilling | 2016-04-08 | 4 | -13/+21 |
|/ / / / / | |||||
* | | | | | Merge branch 'api-filter-milestone' into 'master' | Rémy Coutable | 2016-04-07 | 1 | -2/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Improve coding and doc style | Robert Schilling | 2016-04-06 | 1 | -1/+1 |
| * | | | | | API: Ability to filter milestones by state | Robert Schilling | 2016-04-06 | 1 | -2/+18 |
* | | | | | | Merge branch 'feature/expose-builds-badge' into 'master' | Rémy Coutable | 2016-04-07 | 1 | -4/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Extend build status badge, add html/markdown methods | Grzegorz Bizon | 2016-04-06 | 1 | -4/+26 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Robert Schilling | 2016-04-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Changed the argument of not_found for 'unprotect' | Yasser Hussain | 2016-04-06 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'saml-external-groups' into 'master' | Robert Speicher | 2016-04-07 | 3 | -2/+64 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Implemented suggested fixes | Patricio Cano | 2016-04-06 | 3 | -6/+4 |
| * | | | | | | Added CHANGELOG itemsaml-external-groups | Patricio Cano | 2016-04-06 | 1 | -1/+0 |
| * | | | | | | Fix error that was causing only one group to be returned and corrected specs ... | Patricio Cano | 2016-04-06 | 1 | -1/+3 |
| * | | | | | | Changed config syntax and improved how chaanges in group memberships are han... | Patricio Cano | 2016-04-05 | 2 | -29/+14 |
| * | | | | | | Prepare SAML for group retrieval | Patricio Cano | 2016-04-04 | 3 | -2/+80 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' | Robert Speicher | 2016-04-07 | 3 | -6/+70 |
|\ \ \ \ \ \ | |||||
| * | | | | | | little refactor and improvements on specs | Gabriel Mazetto | 2016-04-06 | 1 | -6/+2 |