Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' | Rubén Dávila Santos | 2017-02-07 | 2 | -2/+18 |
|\ | |||||
| * | Use normal associations instead of polymorphic. | Ruben Davila | 2017-02-07 | 2 | -2/+18 |
* | | Merge branch '25487-small-improvements-to-the-ui-of-mattermost-and-slack-comm... | Clement Ho | 2017-02-07 | 3 | -5/+5 |
|\ \ | |||||
| * | | Added small improvments to the chat slash command services | Luke "Jared" Bennett | 2017-02-07 | 3 | -5/+5 |
* | | | Merge branch '24147-delete-env-button' into 'master' | Rémy Coutable | 2017-02-07 | 2 | -6/+6 |
|\ \ \ | |||||
| * | | | Fix stoppable? | Kamil Trzcinski | 2017-02-07 | 1 | -1/+1 |
| * | | | Update changes | Kamil Trzcinski | 2017-02-06 | 1 | -4/+4 |
| * | | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-button | Kamil Trzcinski | 2017-02-06 | 32 | -352/+569 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into 24147-delete-env-button | Kamil Trzcinski | 2017-01-24 | 113 | -1685/+3006 |
| |\ \ \ \ | |||||
| * | | | | | Allow to stop any environment | Kamil Trzcinski | 2016-11-10 | 1 | -4/+9 |
* | | | | | | Merge branch 'refresh-permissions-when-moving-projects' into 'master' | Rémy Coutable | 2017-02-07 | 2 | -1/+10 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projects | Yorick Peterse | 2017-02-07 | 2 | -1/+10 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master' | Sean McGivern | 2017-02-07 | 1 | -3/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Use reCaptcha when an issue identified as spam | Jarka Kadlecova | 2017-02-07 | 1 | -3/+9 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'ee-1439-read-only-user' into 'master' | Douwe Maan | 2017-02-07 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | Fix indentationee-1439-read-only-user | Douwe Maan | 2017-02-06 | 1 | -4/+4 |
| * | | | | Backport of the frontend view, including tests | Jose Ivan Vargas | 2017-02-06 | 1 | -0/+15 |
* | | | | | Merge branch 'fix-deleting-project-again' into 'master' | Douwe Maan | 2017-02-06 | 1 | -4/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Skip or retain project while deleting the project: | Lin Jen-Shin | 2017-02-03 | 1 | -4/+17 |
* | | | | | | Don't delete assigned MRs/issues when user is deleted | Douwe Maan | 2017-02-06 | 1 | -2/+3 |
* | | | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 4 | -7/+17 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-time | Adam Niedzielski | 2017-02-06 | 2 | -2/+16 |
| | |/ / / | |/| | | | |||||
| * | | | | Remove backlog lists from boards | Douglas Barbosa Alexandre | 2017-02-03 | 2 | -5/+1 |
| |/ / / | |||||
* | | | | Merge branch 'master' into jej-pages-picked-from-ee | James Edwards-Jones | 2017-02-03 | 8 | -255/+321 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'squash' into 'master' | Sean McGivern | 2017-02-03 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Backport changes from EE squash | Sean McGivern | 2017-02-03 | 1 | -2/+2 |
| * | | | | Merge branch 'fwn-to-find-by-full-path' into 'master' | Dmitriy Zaporozhets | 2017-02-03 | 1 | -5/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | replace `find_with_namespace` with `find_by_full_path` | Adam Pahlevi | 2017-02-03 | 1 | -5/+1 |
| * | | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' | Douwe Maan | 2017-02-02 | 2 | -221/+275 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-file | Lin Jen-Shin | 2017-02-02 | 11 | -82/+113 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2017-01-26 | 1 | -4/+4 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Use commit rather than branch, and rename to avoid confusion | Lin Jen-Shin | 2017-01-26 | 1 | -8/+8 |
| | * | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2017-01-26 | 81 | -427/+788 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Rename from base to start because base could mean merge base | Lin Jen-Shin | 2017-01-06 | 1 | -39/+39 |
| | * | | | | | | Rename source to base to avoid confusion from MR | Lin Jen-Shin | 2017-01-06 | 1 | -39/+39 |
| | * | | | | | | Prefer leading dots over trailing dots | Lin Jen-Shin | 2017-01-06 | 1 | -2/+2 |
| | * | | | | | | Remove tag with git hooks | Lin Jen-Shin | 2017-01-05 | 1 | -8/+11 |
| | * | | | | | | Introduce Repository#with_repo_branch_commit | Lin Jen-Shin | 2017-01-05 | 1 | -9/+16 |
| | * | | | | | | Indent the way rubocop likes | Lin Jen-Shin | 2017-01-05 | 1 | -1/+1 |
| | * | | | | | | Merge branch 'master' into fix-git-hooks-when-creating-file | Lin Jen-Shin | 2017-01-04 | 62 | -439/+1168 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Also check blob path from source branch | Lin Jen-Shin | 2016-12-14 | 1 | -18/+39 |
| | * | | | | | | | Not sure why, but apparently SHA works better | Lin Jen-Shin | 2016-12-12 | 1 | -2/+2 |
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-12-10 | 12 | -141/+226 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Pass source_commit so that we save a few lookups | Lin Jen-Shin | 2016-12-10 | 1 | -33/+18 |
| | * | | | | | | | | Use rugged.references.delete to delete reference | Lin Jen-Shin | 2016-12-09 | 1 | -3/+3 |
| | * | | | | | | | | Introduce git_action and normalize previous_path | Lin Jen-Shin | 2016-12-09 | 1 | -26/+46 |
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-12-08 | 19 | -97/+119 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Introduce Repository#with_tmp_ref which we need | Lin Jen-Shin | 2016-12-08 | 2 | -1/+17 |
| | * | | | | | | | | | Cleanup parameters, easier to understand and | Lin Jen-Shin | 2016-12-08 | 1 | -43/+48 |
| | * | | | | | | | | | find the commit properly and replicate gitlab_git | Lin Jen-Shin | 2016-12-08 | 1 | -1/+5 |