Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changes verb `references` to noun `reference`.cross-project-reference-typo-fix | Jacob Schatz | 2016-01-08 | 1 | -1/+1 |
| | |||||
* | Merge branch 'cross-project-reference-move' into 'master' | Dmitriy Zaporozhets | 2016-01-08 | 1 | -9/+10 |
|\ | | | | | | | | | | | | | | | | | adds reference to the bottom of sidebar Fixes #4183 ![Screen_Shot_2016-01-07_at_3.17.32_PM](/uploads/8d71b475f1775d555cf5898921e86a1d/Screen_Shot_2016-01-07_at_3.17.32_PM.png) See merge request !2339 | ||||
| * | adds reference to the bottom of sidebar | Jacob Schatz | 2016-01-07 | 1 | -9/+10 |
| | | |||||
* | | Use `xmlschema` where even more appropriate! | Robert Speicher | 2016-01-07 | 8 | -9/+9 |
| | | |||||
* | | Use `to_s(:iso8601)` where appropriate | Robert Speicher | 2016-01-07 | 10 | -11/+11 |
| | | |||||
* | | Add two custom Date/Time conversion formats | Robert Speicher | 2016-01-07 | 6 | -9/+9 |
| | | |||||
* | | Remove stamp gem | Robert Speicher | 2016-01-07 | 7 | -10/+10 |
|/ | | | | Closes #5908 | ||||
* | Fix typo in js method and some repeating css | Dmitriy Zaporozhets | 2016-01-07 | 1 | -4/+4 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Add support for ref and path to commits filtering | Dmitriy Zaporozhets | 2016-01-07 | 1 | -1/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Add ajax filtering for commits list | Dmitriy Zaporozhets | 2016-01-07 | 1 | -6/+4 |
| | | | | | | Also handle commits list with Pager class to prevent code duplication Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Add search field to commits page | Dmitriy Zaporozhets | 2016-01-07 | 1 | -6/+12 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Jacob Vosmaer | 2016-01-07 | 5 | -6/+61 |
| | |||||
* | Merge branch 'remove-influxdb-credentials' into 'master' | Yorick Peterse | 2016-01-07 | 1 | -8/+0 |
|\ | | | | | See merge request !2319 | ||||
| * | Remove InfluxDB username/passwordremove-influxdb-credentials | Yorick Peterse | 2016-01-06 | 1 | -8/+0 |
| | | | | | | | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings. | ||||
* | | Merge branch 'more-opengraph' into 'master' | Robert Speicher | 2016-01-06 | 5 | -10/+17 |
|\ \ | | | | | | | | | | | | | Add Open Graph data for group, project and commit. See merge request !2211 | ||||
| * \ | Merge branch 'master' into more-opengraphmore-opengraph | Douwe Maan | 2016-01-06 | 2 | -1/+16 |
| |\ \ | | |/ | |||||
| * | | Don't override issue page description in project layout. | Douwe Maan | 2016-01-06 | 3 | -2/+4 |
| | | | |||||
| * | | Remove now-redundant `page_description` call from Groups#show | Robert Speicher | 2016-01-05 | 1 | -2/+0 |
| | | | |||||
| * | | Remove now-redundant `page_description` call from Projects#show | Robert Speicher | 2016-01-05 | 1 | -3/+1 |
| | | | |||||
| * | | Make `page_description` less magical :sparkles: | Robert Speicher | 2016-01-05 | 2 | -6/+8 |
| | | | |||||
| * | | Merge branch 'master' into more-opengraph | Douwe Maan | 2016-01-05 | 32 | -129/+193 |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml | ||||
| * | | | Add Open Graph data for group, project and commit. | Douwe Maan | 2015-12-25 | 4 | -6/+12 |
| | | | | |||||
* | | | | Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked | Douwe Maan | 2016-01-06 | 2 | -1/+16 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix the abuse report detail URL in the HTML email templaters-fix-abuse-report-url | Robert Speicher | 2016-01-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' | Douwe Maan | 2016-01-05 | 1 | -0/+15 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301 | ||||
| | * | | Merge branch 'master' into diverging-branch-graphs | Jeff Stubler | 2015-12-03 | 135 | -754/+867 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into diverging-branch-graphs | Jeff Stubler | 2015-11-12 | 99 | -420/+956 |
| | |\ \ \ | |||||
| | * | | | | Refactor for style issues | Jeff Stubler | 2015-11-11 | 1 | -5/+6 |
| | | | | | | |||||
| | * | | | | Add graphs showing commits ahead and behind default to branches page | Jeff Stubler | 2015-11-01 | 1 | -0/+14 |
| | | | | | | |||||
* | | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR ↵ | Douwe Maan | 2016-01-05 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | target branch while builds were running | ||||
* | | | | | Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' | Douwe Maan | 2016-01-05 | 2 | -4/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'New Merge Request' buttons on canonical repo. (by @joshfng) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners. See merge request !2300 | ||||
| * | | | | | Change text back. Add additional tests.joshfng/gitlab-ce-fix-3802 | Josh Frye | 2016-01-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix tests | Josh Frye | 2016-01-03 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Show 'New Merge Request' buttons on canonical repo. | Josh Frye | 2016-01-03 | 2 | -5/+7 |
| | | | | | | |||||
* | | | | | | Merge branch 'improved-leave-project' into 'master' | Dmitriy Zaporozhets | 2016-01-05 | 2 | -16/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds settings menu to the top for editting and leaving projects @creamzy @skyruler @dzaporozhets Menu contents depends on user's rights. Fixes #4221 ![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png) ![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png) ![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png) ![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png) See merge request !2195 | ||||
| * | | | | | | removes footer message about access to project | Jacob Schatz | 2016-01-04 | 1 | -8/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into improved-leave-project | Jacob Schatz | 2015-12-28 | 1 | -0/+53 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | fixes tests failing | Jacob Schatz | 2015-12-28 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | adds settings menu to the top for editting and leaving projects | Jacob Schatz | 2015-12-28 | 2 | -9/+18 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'rs-logo-animation' into 'master' | Dmitriy Zaporozhets | 2016-01-05 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the logo as a loading indicator ![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif) See merge request !2277 | ||||
| * | | | | | | | | Correct the logo ID names | Robert Speicher | 2016-01-04 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Her left, not ours! | ||||
| * | | | | | | | | Give the logo shapes meaningful IDs | Robert Speicher | 2016-01-02 | 1 | -7/+7 |
| | | | | | | | | | |||||
* | | | | | | | | | Redesign the AbuseReports indexrs-abuse-reports | Robert Speicher | 2016-01-04 | 2 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Shows when the reported user joined - Show relative timestamp for when the report was created - Parse message with restricted Markdown pipeline to autolink URLs | ||||
* | | | | | | | | | Merge branch 'show-all-builds-by-default' into 'master' | Robert Speicher | 2016-01-04 | 2 | -11/+11 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show all builds by default in the builds page Fixes #4240 See merge request !2243 | ||||
| * | | | | | | | | | Show 'All' tab by default in the builds pageshow-all-builds-by-default | Douglas Barbosa Alexandre | 2016-01-04 | 2 | -11/+11 |
| | | | | | | | | | | |||||
* | | | | | | | | | | remove public field from namespace and refactoringnamespace-clean_up | Valery Sizov | 2016-01-04 | 2 | -11/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'rs-delimit-all-the-things' into 'master' | Dmitriy Zaporozhets | 2016-01-04 | 11 | -36/+36 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number_with_delimiter most of the things See merge request !2258 | ||||
| * | | | | | | | | | number_with_delimiter most of the thingsrs-delimit-all-the-things | Robert Speicher | 2015-12-31 | 11 | -36/+36 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs-abuse-report-form' into 'master' | Dmitriy Zaporozhets | 2016-01-04 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add js-requires-input and js-quick-submit to abuse report form See merge request !2245 | ||||
| * | | | | | | | | | | Add js-requires-input and js-quick-submit to abuse report formrs-abuse-report-form | Robert Speicher | 2015-12-30 | 1 | -2/+2 |
| | | | | | | | | | | |