summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update SSL ciphers per logjam vulnerability recommendations.update_ssl_ciphersMarin Jankovski2015-06-152-1/+2
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-06-158-18/+41
|\
| * Merge branch 'remove-visibility-icons' into 'master'Douwe Maan2015-06-153-6/+3
| |\
| | * Remove visibility icon from projects list on dashboard and group pageremove-visibility-iconsDmitriy Zaporozhets2015-06-123-6/+3
| * | Merge branch 'fix-post-receive-external-tracker' into 'master'Douwe Maan2015-06-155-11/+37
| |\ \
| | * | Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-125-11/+37
| * | | Merge branch 'update-irker-home' into 'master'Robert Schilling2015-06-151-1/+1
| |\ \ \
| | * | | Update Irker home pageStan Hu2015-06-141-1/+1
* | | | | Merge branch 'remove_all_projects_button' into 'master'Douwe Maan2015-06-151-3/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove button to all projects on Trending Projects page.Nicolas2015-06-141-3/+0
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1418-77/+75
|\ \ \ \
| * \ \ \ Merge branch 'rs-issue-1432' into 'master'Dmitriy Zaporozhets2015-06-142-3/+3
| |\ \ \ \
| | * | | | Update Redcarpet to 3.3.0rs-issue-1432Robert Speicher2015-06-132-3/+3
| | |/ / /
| * | | | Merge branch 'rs-expect-syntax-specs' into 'master'Dmitriy Zaporozhets2015-06-1416-74/+72
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use `page.all` and `page.within` in specsrs-expect-syntax-specsRobert Speicher2015-06-134-20/+20
| | * | | Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher2015-06-1313-48/+46
| | * | | Change `foo.should_not` syntax to `expect(foo).not_to` in specsRobert Speicher2015-06-134-6/+6
| |/ / /
* | | | Merge pull request #9340 from jvanbaarsen/update-noteableDmitriy Zaporozhets2015-06-143-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Update noteable after a new note is addedJeroen van Baarsen2015-06-053-2/+6
* | | | Merge branch 'rs-issue-1798' into 'master'Dmitriy Zaporozhets2015-06-133-12/+12
|\ \ \ \
| * | | | Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-133-12/+12
|/ / / /
* | | | Merge branch 'regex-anchor-docs' into 'master'Sytse Sijbrandij2015-06-121-0/+30
|\ \ \ \
| * | | | Add info about regex anchors to shell command docs.Douwe Maan2015-06-121-0/+30
|/ / / /
* | | | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-1210-4/+30
|\ \ \ \
| * | | | session_expire_seconds => session_expire_delaythemaze752015-06-1010-16/+25
| * | | | Add session expiration delay configuration through UI applicationEric Maziade2015-06-0510-4/+21
* | | | | Merge branch 'update-guides-7.12' into 'master'Jacob Vosmaer2015-06-122-10/+144
|\ \ \ \ \
| * | | | | Move mention of git 2.1.2 to intro paragraphJacob Vosmaer2015-06-121-5/+4
| * | | | | Add 7.12 update guidesJacob Vosmaer2015-06-122-10/+145
* | | | | | Merge branch 'fix_typo_account_page' into 'master'Douwe Maan2015-06-121-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo on account page.Nicolas2015-06-121-1/+1
* | | | | | | Merge branch 'update-install-docs' into 'master'Marin Jankovski2015-06-121-4/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | New source installs should use 7-12-stableJacob Vosmaer2015-06-121-2/+2
| * | | | | | Install git 2.4.3Jacob Vosmaer2015-06-121-2/+2
|/ / / / / /
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1270-831/+831
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs-expect-syntax-features' into 'master'Dmitriy Zaporozhets2015-06-1270-831/+831
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-1210-12/+12
| | * | | | | Change `within` to `page.within` in feature stepsRobert Speicher2015-06-1234-159/+159
| | * | | | | Update all `should`-style syntax to `expect` in featuresRobert Speicher2015-06-1269-662/+662
| |/ / / / /
* | | | | | Merge branch 'remove-activity-feed-text' into 'master'Dmitriy Zaporozhets2015-06-123-3/+0
|\ \ \ \ \ \
| * | | | | | Remove text since rss is now to prominent.Sytse Sijbrandij2015-06-123-3/+0
* | | | | | | Merge branch 'rc1-release-doc-link' into 'master'Job van der Voort2015-06-121-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix link to howto_rc1.mdJacob Vosmaer2015-06-121-1/+1
|/ / / / / /
* | | | | | Merge branch 'note_about_omnibus_changes' into 'master'Dmitriy Zaporozhets2015-06-128-4/+31
|\ \ \ \ \ \
| * | | | | | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changesMarin Jankovski2015-06-118-4/+31
* | | | | | | Merge branch 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-1228-299/+306
|\ \ \ \ \ \ \
| * | | | | | | Fix test for accept merge requestDmitriy Zaporozhets2015-06-121-0/+1
| * | | | | | | Fix merge request testrefactor-mr-widgetDmitriy Zaporozhets2015-06-111-1/+1
| * | | | | | | Fix automergeDmitriy Zaporozhets2015-06-112-5/+4
| * | | | | | | Improve variables in mr widgetDmitriy Zaporozhets2015-06-115-15/+8